diff options
| author | unknown <serg@serg.mylan> | 2004-09-08 10:45:50 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-09-08 10:45:50 +0200 |
| commit | 7d717939b453021196da0192f8ac95f5526f01f4 (patch) | |
| tree | 59364d0f75ef5adf46f210dd9a0fb5907ce8219d /sql/slave.cc | |
| parent | 3f70b62cebfbaa0e93ea5f378167d9d3e7b02a91 (diff) | |
| download | mariadb-git-7d717939b453021196da0192f8ac95f5526f01f4.tar.gz | |
few s/sql_print_error/sql_print_information/
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index a45c5c62322..4ef8715f1e6 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3016,7 +3016,7 @@ slave_begin: thd->proc_info = "Connecting to master"; // we can get killed during safe_connect 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, mi->host, mi->port, IO_RPL_LOG_NAME, @@ -3351,7 +3351,7 @@ slave_begin: rli->group_master_log_name, llstr(rli->group_master_log_pos,llbuff))); 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, llstr(rli->group_master_log_pos,llbuff),rli->group_relay_log_name, llstr(rli->group_relay_log_pos,llbuff1)); @@ -3372,7 +3372,7 @@ Slave SQL thread aborted. Can't execute init_slave query"); while (!sql_slave_killed(thd,rli)) { - thd->proc_info = "Reading event from the relay log"; + thd->proc_info = "Reading event from the relay log"; DBUG_ASSERT(rli->sql_thd == thd); THD_CHECK_SENTRY(thd); if (exec_relay_log_event(thd,rli)) @@ -3382,16 +3382,14 @@ Slave SQL thread aborted. Can't execute init_slave query"); sql_print_error("\ Error running query, slave SQL thread aborted. Fix the problem, and restart \ the slave SQL thread with \"SLAVE START\". We stopped at log \ -'%s' position %s", - RPL_LOG_NAME, llstr(rli->group_master_log_pos, llbuff)); +'%s' position %s", RPL_LOG_NAME, llstr(rli->group_master_log_pos, llbuff)); goto err; } } /* Thread stopped. Print the current replication position to the log */ - sql_print_error("Slave SQL thread exiting, replication stopped in log \ - '%s' at position %s", - RPL_LOG_NAME, llstr(rli->group_master_log_pos,llbuff)); + sql_print_information("Slave SQL thread exiting, replication stopped in log \ + '%s' at position %s", RPL_LOG_NAME, llstr(rli->group_master_log_pos,llbuff)); err: VOID(pthread_mutex_lock(&LOCK_thread_count)); @@ -3947,7 +3945,7 @@ Error: '%s' errno: %d retry-time: %d retries: %d", if (reconnect) { 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, mi->host, mi->port, IO_RPL_LOG_NAME, |