Merge remote-tracking branch 'upstream/v2.0-lab' into v2.0-lab

lib/MySQL_PreparedStatement.cpp

@@ -785,10 +785,13 @@ 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/SQLite3_Server.cpp

@@ -59,30 +59,6 @@
         } while (rc==SQLITE_LOCKED || rc==SQLITE_BUSY);\
 } while (0)
 
-/*
-static void StringToHex(unsigned char *string, unsigned char *hexstring, size_t l) {
-	unsigned char ch;
-	size_t i, j;
-
-	for (i=0, j=0; i<l; i++, j+=2) {
-		ch=string[i];
-		ch = ch >> 4;
-		if (ch <= 9) {
-			hexstring[j]= '0' + ch;
-		} else {
-			hexstring[j]= 'A' + ch - 10;
-		}
-		ch = string[i];
-		ch = ch & 0x0F;
-		if (ch <= 9) {
-			hexstring[j+1]= '0' + ch;
-		} else {
-			hexstring[j+1]= 'A' + ch - 10;
-		}
-	}
-}
-*/
-
 struct cpu_timer
 {
 	cpu_timer() {