diff options
| author | unknown <guilhem@mysql.com> | 2003-06-17 23:19:38 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2003-06-17 23:19:38 +0200 |
| commit | b518744d16a516c842c4ec0382c8ab44a38aebca (patch) | |
| tree | 0825c0f53219f2374436f0084dbdf2069f354e63 /sql/sql_repl.cc | |
| parent | 926d86db642b7aa6092c7bcf13a3a9cbf963ea52 (diff) | |
| download | mariadb-git-b518744d16a516c842c4ec0382c8ab44a38aebca.tar.gz | |
Changed change_master() to use ER_MASTER_INFO (better display).
mysql-test/r/rpl_rotate_logs.result:
result update
mysql-test/t/rpl_rotate_logs.test:
comments and test update with the error code
sql/slave.cc:
A DBUG_PRINT
sql/sql_repl.cc:
Use ER_MASTER_INFO instead of custom message and zero error code (which display
badly).
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index a651d8002fd..e3af076da1f 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -828,7 +828,7 @@ int change_master(THD* thd, MASTER_INFO* mi) // TODO: see if needs re-write if (init_master_info(mi, master_info_file, relay_log_info_file, 0)) { - send_error(&thd->net, 0, "Could not initialize master info"); + send_error(&thd->net, ER_MASTER_INFO); unlock_slave_threads(mi); DBUG_RETURN(1); } |