summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhezx@mail.hezx.com <>2008-01-30 16:40:36 +0800
committerhezx@mail.hezx.com <>2008-01-30 16:40:36 +0800
commitafe8ac3128f36d5e3d078c78907760fb579dbca8 (patch)
treeb0dcec36695dd3b80123d29af9bcfaa5ea1fddec
parent7572a9e3910c7934c8efd508cca513b1b539d954 (diff)
parente4f37eab5658c368bfccdda4493a6d8060356dfb (diff)
downloadmariadb-git-afe8ac3128f36d5e3d078c78907760fb579dbca8.tar.gz
Merge zhe@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into mail.hezx.com:/media/sda3/work/mysql/bkwork/bug26489_corruption_in_relay_log/5.0
-rw-r--r--sql/sql_parse.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 16a64c48cdd..a3547787e86 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1999,7 +1999,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
unregister_slave(thd,1,1);
/* fake COM_QUIT -- if we get here, the thread needs to terminate */
error = TRUE;
- net->error = 0;
break;
}
#endif