database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge with 3.23.52

Browse Source 
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
This commit is contained in:
unknown
2002-06-17 16:08:34 +03:00
parent 4249f4cb72 f97e1b6ae1
commit 9424f80f19
7 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/mysqld.cc
View File

@ -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;
}