diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-10-04 15:46:04 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-10-04 15:46:04 -0600 |
| commit | 89055361b9203be1d4e813b00aa5dfbc6e9b0caa (patch) | |
| tree | f15f127921d230171bb0ac60a5a854a61af3b185 /sql/log_event.cc | |
| parent | 5ee900d38a1d20247823ab23a441cbb78ac9942a (diff) | |
| parent | 6bede5bed1add70fb5bb442ba70fe029c4c534f7 (diff) | |
| download | mariadb-git-89055361b9203be1d4e813b00aa5dfbc6e9b0caa.tar.gz | |
Merge
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/item_func.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
acinclude.m4:
SCCS merged
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 7183e4caebb..5bd386c7b29 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1513,10 +1513,10 @@ int Query_log_event::exec_event(struct st_master_info* mi) (actual_error = thd->net.last_errno) && expected_error) { const char* errmsg = "Slave: did not get the expected error\ - running query from master - expected: '%s'(%d), got '%s'(%d)"; + running query from master - expected: '%s' (%d), got '%s' (%d)"; sql_print_error(errmsg, ER_SAFE(expected_error), expected_error, - actual_error ? thd->net.last_error:"no error", + actual_error ? thd->net.last_error: "no error", actual_error); thd->query_error = 1; } |