diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-17 16:08:34 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-17 16:08:34 +0300 |
| commit | 9424f80f19a84eb667c3d588d8c0d19b833c7c28 (patch) | |
| tree | e4d5406e65acbe043641f5915d4443ec98eb1c8c /sql | |
| parent | 4249f4cb72e29005d00f0049f4b322e7c759b88f (diff) | |
| parent | f97e1b6ae19ad9b3d3814edd2475c5a25a7ad9e8 (diff) | |
| download | mariadb-git-9424f80f19a84eb667c3d588d8c0d19b833c7c28.tar.gz | |
Merge with 3.23.52
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-linux-build:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 4 | ||||
| -rw-r--r-- | sql/sql_base.cc | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b6481d4e787..f1e863b830e 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1679,8 +1679,8 @@ pthread_handler_decl(handle_shutdown,arg) abort_loop = 1; // unblock select() - so_cancel( ip_sock); - so_cancel( unix_sock); + so_cancel(ip_sock); + so_cancel(unix_sock); return 0; } diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 5741be69032..d93b40180ee 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -554,6 +554,7 @@ void close_temporary_tables(THD *thd) *--end = 0; // Remove last ',' thd->query_length = (uint)(end-query); Query_log_event qinfo(thd, query); + qinfo.error_code=0; mysql_bin_log.write(&qinfo); thd->query_length = save_query_len; } |