1 files changed, 20 insertions, 20 deletions

diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc
index 81627dceb0e..4295a16c547 100644
--- a/sql/repl_failsafe.cc
+++ b/sql/repl_failsafe.cc
@@ -184,7 +184,7 @@ err:
   my_message(ER_UNKNOWN_ERROR, "Wrong parameters to function register_slave",
 	     MYF(0));
 err2:
-  send_error(&thd->net);
+  send_error(thd);
   return 1;
 }
 
@@ -202,7 +202,7 @@ static void slave_info_free(void *s)
 
 void init_slave_list()
 {
-  hash_init(&slave_list, SLAVE_LIST_CHUNK, 0, 0,
+  hash_init(&slave_list, system_charset_info, SLAVE_LIST_CHUNK, 0, 0,
 	    (hash_get_key) slave_list_key, slave_info_free, 0);
   pthread_mutex_init(&LOCK_slave_list, MY_MUTEX_INIT_FAST);
 }
@@ -440,7 +440,7 @@ int show_new_master(THD* thd)
     net_store_data(packet, (longlong)lex_mi->pos);
     if (my_net_write(&thd->net, packet->ptr(), packet->length()))
       DBUG_RETURN(-1);
-    send_eof(&thd->net);
+    send_eof(thd);
     DBUG_RETURN(0);
   }
 }
@@ -455,7 +455,7 @@ int update_slave_list(MYSQL* mysql)
   int port_ind;
   DBUG_ENTER("update_slave_list");
 
-  if (mc_mysql_query(mysql,"SHOW SLAVE HOSTS",0) ||
+  if (mc_mysql_query(mysql,"SHOW SLAVE HOSTS",16) ||
       !(res = mc_mysql_store_result(mysql)))
   {
     error = "Query error";
@@ -619,7 +619,7 @@ int show_slave_hosts(THD* thd)
     }
   }
   pthread_mutex_unlock(&LOCK_slave_list);
-  send_eof(net);
+  send_eof(thd);
   DBUG_RETURN(0);
 }
 
@@ -705,7 +705,7 @@ int load_master_data(THD* thd)
       (error=terminate_slave_threads(active_mi,restart_thread_mask,
 				     1 /*skip lock*/)))
   {
-    send_error(&thd->net,error);
+    send_error(thd,error);
     unlock_slave_threads(active_mi);
     UNLOCK_ACTIVE_MI;
     return 1;
@@ -713,7 +713,7 @@ int load_master_data(THD* thd)
   
   if (connect_to_master(thd, &mysql, active_mi))
   {
-    net_printf(&thd->net, error= ER_CONNECT_TO_MASTER,
+    net_printf(thd, error= ER_CONNECT_TO_MASTER,
 	       mc_mysql_error(&mysql));
     goto err;
   }
@@ -723,10 +723,10 @@ int load_master_data(THD* thd)
     MYSQL_RES *db_res, **table_res, **table_res_end, **cur_table_res;
     uint num_dbs;
 
-    if (mc_mysql_query(&mysql, "show databases", 0) ||
+    if (mc_mysql_query(&mysql, "SHOW DATABASES", 14) ||
 	!(db_res = mc_mysql_store_result(&mysql)))
     {
-      net_printf(&thd->net, error = ER_QUERY_ON_MASTER,
+      net_printf(thd, error = ER_QUERY_ON_MASTER,
 		 mc_mysql_error(&mysql));
       goto err;
     }
@@ -740,7 +740,7 @@ int load_master_data(THD* thd)
 
     if (!(table_res = (MYSQL_RES**)thd->alloc(num_dbs * sizeof(MYSQL_RES*))))
     {
-      net_printf(&thd->net, error = ER_OUTOFMEMORY);
+      net_printf(thd, error = ER_OUTOFMEMORY);
       goto err;
     }
 
@@ -750,11 +750,11 @@ int load_master_data(THD* thd)
       we wait to issue FLUSH TABLES WITH READ LOCK for as long as we
       can to minimize the lock time.
     */
-    if (mc_mysql_query(&mysql, "FLUSH TABLES WITH READ LOCK", 0) ||
-	mc_mysql_query(&mysql, "SHOW MASTER STATUS",0) ||
+    if (mc_mysql_query(&mysql, "FLUSH TABLES WITH READ LOCK", 27) ||
+	mc_mysql_query(&mysql, "SHOW MASTER STATUS",18) ||
 	!(master_status_res = mc_mysql_store_result(&mysql)))
     {
-      net_printf(&thd->net, error = ER_QUERY_ON_MASTER,
+      net_printf(thd, error = ER_QUERY_ON_MASTER,
 		 mc_mysql_error(&mysql));
       goto err;
     }
@@ -794,16 +794,16 @@ int load_master_data(THD* thd)
       if (mysql_rm_db(thd, db, 1,1) ||
 	  mysql_create_db(thd, db, 0, 1))
       {
-	send_error(&thd->net, 0, 0);
+	send_error(thd, 0, 0);
 	cleanup_mysql_results(db_res, cur_table_res - 1, table_res);
 	goto err;
       }
 
       if (mc_mysql_select_db(&mysql, db) ||
-	  mc_mysql_query(&mysql, "show tables", 0) ||
+	  mc_mysql_query(&mysql, "SHOW TABLES", 11) ||
 	  !(*cur_table_res = mc_mysql_store_result(&mysql)))
       {
-	net_printf(&thd->net, error = ER_QUERY_ON_MASTER,
+	net_printf(thd, error = ER_QUERY_ON_MASTER,
 		   mc_mysql_error(&mysql));
 	cleanup_mysql_results(db_res, cur_table_res - 1, table_res);
 	goto err;
@@ -844,9 +844,9 @@ int load_master_data(THD* thd)
       mc_mysql_free_result(master_status_res);
     }
 
-    if (mc_mysql_query(&mysql, "UNLOCK TABLES", 0))
+    if (mc_mysql_query(&mysql, "UNLOCK TABLES", 13))
     {
-      net_printf(&thd->net, error = ER_QUERY_ON_MASTER,
+      net_printf(thd, error = ER_QUERY_ON_MASTER,
 		 mc_mysql_error(&mysql));
       goto err;
     }
@@ -856,7 +856,7 @@ int load_master_data(THD* thd)
 		       0 /* not only reset, but also reinit */,
 		       &errmsg))
   {
-    send_error(&thd->net, 0, "Failed purging old relay logs");
+    send_error(thd, 0, "Failed purging old relay logs");
     unlock_slave_threads(active_mi);
     UNLOCK_ACTIVE_MI;
     return 1;
@@ -884,7 +884,7 @@ err:
 
   mc_mysql_close(&mysql); // safe to call since we always do mc_mysql_init()
   if (!error)
-    send_ok(&thd->net);
+    send_ok(thd);
 
   return error;
 }