diff options
| author | unknown <istruewing@stella.local> | 2008-03-20 11:33:34 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2008-03-20 11:33:34 +0100 |
| commit | eb9f258e18cdc40f715a471730fae455c02013d1 (patch) | |
| tree | 17d06f386cb0532c8cb159b9168250bde33f2053 /sql/repl_failsafe.cc | |
| parent | 89c00e426de2e0dc521b3adf7f3371fc258dae1b (diff) | |
| parent | 0cb21ac297cd5fd8d933224272e9534ecd22f3c4 (diff) | |
| download | mariadb-git-eb9f258e18cdc40f715a471730fae455c02013d1.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into stella.local:/home2/mydev/mysql-5.1-axmrg
configure.in:
Auto merged
sql/log_event.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 10f32aa5827..d7e783f534f 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -201,7 +201,7 @@ int register_slave(THD* thd, uchar* packet, uint packet_length) err: my_free(si, MYF(MY_WME)); - my_message(ER_UNKNOWN_ERROR, errmsg, MYF(0)); + my_message(ER_UNKNOWN_ERROR, errmsg, MYF(0)); /* purecov: inspected */ err2: return 1; } |