diff options
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 6ba1ce6267f..0d6ed33e952 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -451,8 +451,9 @@ bool show_new_master(THD* thd) if (translate_master(thd, lex_mi, errmsg)) { if (errmsg[0]) - my_error(ER_ERROR_WHEN_EXECUTING_COMMAND, MYF(0), - "SHOW NEW MASTER", errmsg); + my_printf_error(ER_ERROR_WHEN_EXECUTING_COMMAND, + ER(ER_ERROR_WHEN_EXECUTING_COMMAND), MYF(0), + "SHOW NEW MASTER", errmsg); DBUG_RETURN(TRUE); } else @@ -783,7 +784,7 @@ bool load_master_data(THD* thd) (error=terminate_slave_threads(active_mi,restart_thread_mask, 1 /*skip lock*/))) { - my_error(error, MYF(0)); + my_message(error, ER(error), MYF(0)); unlock_slave_threads(active_mi); pthread_mutex_unlock(&LOCK_active_mi); return TRUE; @@ -791,7 +792,8 @@ bool load_master_data(THD* thd) if (connect_to_master(thd, &mysql, active_mi)) { - my_error(error= ER_CONNECT_TO_MASTER, MYF(0), mysql_error(&mysql)); + my_printf_error(error= ER_CONNECT_TO_MASTER, + ER(ER_CONNECT_TO_MASTER), MYF(0), mysql_error(&mysql)); goto err; } @@ -803,7 +805,8 @@ bool load_master_data(THD* thd) if (mysql_real_query(&mysql, "SHOW DATABASES", 14) || !(db_res = mysql_store_result(&mysql))) { - my_error(error = ER_QUERY_ON_MASTER, MYF(0), mysql_error(&mysql)); + my_printf_error(error = ER_QUERY_ON_MASTER, + ER(ER_QUERY_ON_MASTER), MYF(0), mysql_error(&mysql)); goto err; } @@ -816,7 +819,7 @@ bool load_master_data(THD* thd) if (!(table_res = (MYSQL_RES**)thd->alloc(num_dbs * sizeof(MYSQL_RES*)))) { - my_error(error = ER_OUTOFMEMORY, MYF(0)); + my_message(error = ER_OUTOFMEMORY, ER(ER_OUTOFMEMORY), MYF(0)); goto err; } @@ -830,7 +833,8 @@ bool load_master_data(THD* thd) mysql_real_query(&mysql, "SHOW MASTER STATUS",18) || !(master_status_res = mysql_store_result(&mysql))) { - my_error(error = ER_QUERY_ON_MASTER, MYF(0), mysql_error(&mysql)); + my_printf_error(error = ER_QUERY_ON_MASTER, + ER(ER_QUERY_ON_MASTER), MYF(0), mysql_error(&mysql)); goto err; } @@ -883,7 +887,8 @@ bool load_master_data(THD* thd) mysql_real_query(&mysql, "SHOW TABLES", 11) || !(*cur_table_res = mysql_store_result(&mysql))) { - my_error(error = ER_QUERY_ON_MASTER, MYF(0), mysql_error(&mysql)); + my_printf_error(error = ER_QUERY_ON_MASTER, + ER(ER_QUERY_ON_MASTER), MYF(0), mysql_error(&mysql)); cleanup_mysql_results(db_res, cur_table_res - 1, table_res); goto err; } @@ -921,7 +926,7 @@ bool load_master_data(THD* thd) if (init_master_info(active_mi, master_info_file, relay_log_info_file, 0)) - my_error(ER_MASTER_INFO, MYF(0)); + my_message(ER_MASTER_INFO, ER(ER_MASTER_INFO), MYF(0)); strmake(active_mi->master_log_name, row[0], sizeof(active_mi->master_log_name)); active_mi->master_log_pos= my_strtoll10(row[1], (char**) 0, &error); @@ -940,7 +945,8 @@ bool load_master_data(THD* thd) if (mysql_real_query(&mysql, "UNLOCK TABLES", 13)) { - my_error(error = ER_QUERY_ON_MASTER, MYF(0), mysql_error(&mysql)); + my_printf_error(error = ER_QUERY_ON_MASTER, + ER(ER_QUERY_ON_MASTER), MYF(0), mysql_error(&mysql)); goto err; } } @@ -949,7 +955,7 @@ bool load_master_data(THD* thd) 0 /* not only reset, but also reinit */, &errmsg)) { - my_error(ER_RELAY_LOG_FAIL, MYF(0), errmsg); + my_printf_error(ER_RELAY_LOG_FAIL, ER(ER_RELAY_LOG_FAIL), MYF(0), errmsg); unlock_slave_threads(active_mi); pthread_mutex_unlock(&LOCK_active_mi); return TRUE; |