Commit 0570fa4e authored by serg@serg.mylan's avatar serg@serg.mylan

Merge bk-internal.mysql.com:/home/bk/mysql-4.1/

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents ad12db76 9a1456b4
...@@ -3016,7 +3016,7 @@ extern "C" pthread_handler_decl(handle_slave_io,arg) ...@@ -3016,7 +3016,7 @@ extern "C" pthread_handler_decl(handle_slave_io,arg)
thd->proc_info = "Connecting to master"; thd->proc_info = "Connecting to master";
// we can get killed during safe_connect // we can get killed during safe_connect
if (!safe_connect(thd, mysql, mi)) if (!safe_connect(thd, mysql, mi))
sql_print_error("Slave I/O thread: connected to master '%s@%s:%d',\ sql_print_information("Slave I/O thread: connected to master '%s@%s:%d',\
replication started in log '%s' at position %s", mi->user, replication started in log '%s' at position %s", mi->user,
mi->host, mi->port, mi->host, mi->port,
IO_RPL_LOG_NAME, IO_RPL_LOG_NAME,
...@@ -3351,7 +3351,7 @@ extern "C" pthread_handler_decl(handle_slave_sql,arg) ...@@ -3351,7 +3351,7 @@ extern "C" pthread_handler_decl(handle_slave_sql,arg)
rli->group_master_log_name, rli->group_master_log_name,
llstr(rli->group_master_log_pos,llbuff))); llstr(rli->group_master_log_pos,llbuff)));
if (global_system_variables.log_warnings) if (global_system_variables.log_warnings)
sql_print_error("Slave SQL thread initialized, starting replication in \ sql_print_information("Slave SQL thread initialized, starting replication in \
log '%s' at position %s, relay log '%s' position: %s", RPL_LOG_NAME, log '%s' at position %s, relay log '%s' position: %s", RPL_LOG_NAME,
llstr(rli->group_master_log_pos,llbuff),rli->group_relay_log_name, llstr(rli->group_master_log_pos,llbuff),rli->group_relay_log_name,
llstr(rli->group_relay_log_pos,llbuff1)); llstr(rli->group_relay_log_pos,llbuff1));
...@@ -3382,16 +3382,14 @@ Slave SQL thread aborted. Can't execute init_slave query"); ...@@ -3382,16 +3382,14 @@ Slave SQL thread aborted. Can't execute init_slave query");
sql_print_error("\ sql_print_error("\
Error running query, slave SQL thread aborted. Fix the problem, and restart \ Error running query, slave SQL thread aborted. Fix the problem, and restart \
the slave SQL thread with \"SLAVE START\". We stopped at log \ the slave SQL thread with \"SLAVE START\". We stopped at log \
'%s' position %s", '%s' position %s", RPL_LOG_NAME, llstr(rli->group_master_log_pos, llbuff));
RPL_LOG_NAME, llstr(rli->group_master_log_pos, llbuff));
goto err; goto err;
} }
} }
/* Thread stopped. Print the current replication position to the log */ /* Thread stopped. Print the current replication position to the log */
sql_print_error("Slave SQL thread exiting, replication stopped in log \ sql_print_information("Slave SQL thread exiting, replication stopped in log \
'%s' at position %s", '%s' at position %s", RPL_LOG_NAME, llstr(rli->group_master_log_pos,llbuff));
RPL_LOG_NAME, llstr(rli->group_master_log_pos,llbuff));
err: err:
VOID(pthread_mutex_lock(&LOCK_thread_count)); VOID(pthread_mutex_lock(&LOCK_thread_count));
...@@ -3947,7 +3945,7 @@ Error: '%s' errno: %d retry-time: %d retries: %d", ...@@ -3947,7 +3945,7 @@ Error: '%s' errno: %d retry-time: %d retries: %d",
if (reconnect) if (reconnect)
{ {
if (!suppress_warnings && global_system_variables.log_warnings) if (!suppress_warnings && global_system_variables.log_warnings)
sql_print_error("Slave: connected to master '%s@%s:%d',\ sql_print_information("Slave: connected to master '%s@%s:%d',\
replication resumed in log '%s' at position %s", mi->user, replication resumed in log '%s' at position %s", mi->user,
mi->host, mi->port, mi->host, mi->port,
IO_RPL_LOG_NAME, IO_RPL_LOG_NAME,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment