Commit 8ffa47c0 authored by guilhem@mysql.com's avatar guilhem@mysql.com

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0

into mysql.com:/home/mysql_src/mysql-4.0
parents 4fcff3d2 a5aeb8f7
...@@ -1862,12 +1862,12 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli) ...@@ -1862,12 +1862,12 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli)
else else
{ {
slave_print_error(rli,expected_error, slave_print_error(rli,expected_error,
"query '%s' partially completed on the master \ "query partially completed on the master \
(error on master: %d) \ (error on master: %d) \
and was aborted. There is a chance that your master is inconsistent at this \ and was aborted. There is a chance that your master is inconsistent at this \
point. If you are sure that your master is ok, run this query manually on the\ point. If you are sure that your master is ok, run this query manually on the\
slave and then restart the slave with SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;\ slave and then restart the slave with SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;\
START SLAVE; .", thd->query, expected_error); START SLAVE; . Query: '%s'", expected_error, thd->query);
thd->query_error= 1; thd->query_error= 1;
} }
goto end; goto end;
...@@ -1896,15 +1896,13 @@ point. If you are sure that your master is ok, run this query manually on the\ ...@@ -1896,15 +1896,13 @@ point. If you are sure that your master is ok, run this query manually on the\
{ {
slave_print_error(rli, 0, slave_print_error(rli, 0,
"\ "\
Query '%s' caused different errors on master and slave. \ Query caused different errors on master and slave. \
Error on master: '%s' (%d), Error on slave: '%s' (%d). \ Error on master: '%s' (%d), Error on slave: '%s' (%d). \
Default database: '%s'", Default database: '%s'. Query: '%s'",
query,
ER_SAFE(expected_error), ER_SAFE(expected_error),
expected_error, expected_error,
actual_error ? thd->net.last_error: "no error", actual_error ? thd->net.last_error: "no error",
actual_error, actual_error, print_slave_db_safe(db), query);
print_slave_db_safe(db));
thd->query_error= 1; thd->query_error= 1;
} }
/* /*
...@@ -1919,11 +1917,10 @@ Default database: '%s'", ...@@ -1919,11 +1917,10 @@ Default database: '%s'",
else if (thd->query_error || thd->fatal_error) else if (thd->query_error || thd->fatal_error)
{ {
slave_print_error(rli,actual_error, slave_print_error(rli,actual_error,
"Error '%s' on query '%s'. Default database: '%s'", "Error '%s' on query. Default database: '%s'. Query: '%s'",
(actual_error ? thd->net.last_error : (actual_error ? thd->net.last_error :
"unexpected success or fatal error"), "unexpected success or fatal error"),
query, print_slave_db_safe(db), query);
print_slave_db_safe(db));
thd->query_error= 1; thd->query_error= 1;
} }
} /* End of if (db_ok(... */ } /* End of if (db_ok(... */
......
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