diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-05-27 23:10:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-05-27 23:10:55 +0200 |
| commit | c2a7dffc573f311029ed4696fb5bd88e5efba752 (patch) | |
| tree | 9f04258d84a42954afb0b8e36486fd6f303cf90d /sql/sql_parse.cc | |
| parent | 520c3f69a6caed5524d3214a0339736d673c4c0c (diff) | |
| parent | f20c63264ab4170fc8e45093042bd2e7272ce9fc (diff) | |
| download | mariadb-git-10.0.tar.gz | |
Merge tag 'mariadb-5.5.68' into 10.0bb-10.0-serg10.0
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 31ce44411ac..a27cbdf5962 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1530,7 +1530,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd, general_log_print(thd, command, "Log: '%s' Pos: %lu", name, pos); if (nlen < FN_REFLEN) mysql_binlog_send(thd, thd->strmake(name, nlen), (my_off_t)pos, flags); - unregister_slave(thd,1,1); /* fake COM_QUIT -- if we get here, the thread needs to terminate */ error = TRUE; break; |