Adding minor conflict resolution fixes

include/MySQL_HostGroups_Manager.h

@@ -517,6 +517,8 @@ class MySQL_HostGroups_Manager {
 	SQLite3_result * get_stats_mysql_gtid_executed();
 	void generate_mysql_gtid_executed_tables();
 	bool gtid_exists(MySrvC *mysrvc, char * gtid_uuid, uint64_t gtid_trxid);
+
+	SQLite3_result *SQL3_Get_ConnPool_Stats();
 	void increase_reset_counter();
 
 };

lib/MySQL_PreparedStatement.cpp

@@ -785,13 +785,10 @@ MySQL_STMT_Global_info *MySQL_STMT_Manager_v14::add_prepared_statement(
 //		                     1);  // increase reference count
 //		*is_new = true;
 		__sync_add_and_fetch(&num_stmt_with_ref_client_count_zero,1);
-<<<<<<< HEAD
 		__sync_add_and_fetch(&num_stmt_with_ref_server_count_zero,1);
 	}
 	if (ret->ref_count_server == 0) {
 		__sync_sub_and_fetch(&num_stmt_with_ref_server_count_zero,1);
-=======
->>>>>>> upstream/v2.0-lab
 	}
 	ret->ref_count_server++;
 	statuses.s_total++;

lib/MySQL_Session.cpp

@@ -724,6 +724,7 @@ bool MySQL_Session::handler_special_queries(PtrSize_t *pkt) {
 		bool collation_specified = false;
 		//unsigned int charsetnr = 0;
 		const MARIADB_CHARSET_INFO * c;
+		char * collation_name_unstripped = NULL;
 		char * collation_name = NULL;
 		if (strcasestr(csname," COLLATE ")) {
 			collation_specified = true;