diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-04-30 17:36:41 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-04-30 17:36:41 +0200 |
| commit | 23c6fb3e6231b8939331e2d9f157092f24ed8f4f (patch) | |
| tree | ff0f65edbc442afcc3f3a3159753c8a2284d9c95 /sql/sql_parse.cc | |
| parent | de8c9b538f7e77f18470ccfcacf723a9c2e31b38 (diff) | |
| parent | 6a31aea5a1a50614af3a6591a085dc47061cdd0e (diff) | |
| download | mariadb-git-23c6fb3e6231b8939331e2d9f157092f24ed8f4f.tar.gz | |
Merge branch '5.5' into 10.1
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 d19cbf5ad9b..656da3b6a79 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1739,7 +1739,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; |