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

Browse Source 
BitKeeper/etc/logging_ok:
  auto-union
acinclude.m4:
  Auto merged
mysql-test/r/null_key.result:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/udf_example.cc:
  Auto merged
This commit is contained in:
unknown
2001-09-28 06:28:04 +02:00
parent a353f6249c 6ba992fb5d
commit 1a57e278c2
12 changed files with 78 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/mysqld.cc
View File

@ -2046,7 +2046,7 @@ The server will not act as a slave.");
{
if(start_mode)
{
if (WaitForSingleObject(hEventShutdown,INFINITE)==WAIT_OBJECT_0)
if (WaitForSingleObject(hEventShutdown,1000)==WAIT_TIMEOUT)
Service.Stop();
}
else