diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-01-30 12:53:33 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-01-30 12:53:33 +0100 |
| commit | 9a51d88bfdd74099e9b98234de57c2a0a83620a0 (patch) | |
| tree | 74b925b2949170822b288f1dccb6bf327fa36a08 /sql/sql_parse.cc | |
| parent | b0f52885519dd934c88574f72baec0008fdf110d (diff) | |
| parent | 817bfa350c6ea2464f1357969f17acd08b909e14 (diff) | |
| download | mariadb-git-9a51d88bfdd74099e9b98234de57c2a0a83620a0.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
BitKeeper/deleted/.del-binlog_start_comment.result:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Auto merged
mysql-test/r/case.result:
Auto merged
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
Auto merged
mysql-test/suite/rpl/r/rpl_000015.result:
Auto merged
mysql-test/suite/rpl/t/rpl_000015.test:
Auto merged
mysql-test/t/case.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
BitKeeper/deleted/.del-binlog_start_comment.test:
Using remote file.
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
Manual merge. Taking remote file to update result set after merge,
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Manual merge.
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Manual merge.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index b60a72e4c53..7261668c05e 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1272,7 +1272,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 |