mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 23:25:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix that mysqladmin shutdown can be interrupted with ^C

Browse source 
Fixed bug with BLOB keys in BDB tables
Fixed problem with MERGE tables on OS with 32 bit files
Fixed that TIME_TO_SEC() works with negative times


Docs/manual.texi:
  Changelog
client/mysqladmin.c:
  Fix that mysqladmin shutdown can be interrupted with ^C
include/mysqld_error.h:
  Fixed typo
mysql-test/r/func_time.result:
  Added test case for negative times
mysql-test/t/func_time.test:
  Added test case for negative times
mysql-test/t/rpl000015-slave.sh:
  Removed warnings
mysql-test/t/rpl000016-slave.sh:
  Removed warnings
sql/field.cc:
  Fixed bug with BLOB keys in BDB tables
sql/field.h:
  Fixed bug with BLOB keys in BDB tables
sql/ha_berkeley.cc:
  Fixed bug with BLOB keys in BDB tables
sql/ha_myisammrg.cc:
  Fixed problem with MERGE tables on OS with 32 bit files
sql/item_timefunc.cc:
  Fixed that TIME_TO_SEC() works with negative times.
sql/share/swedish/errmsg.txt:
  Merge with 4.0
sql/sql_acl.cc:
  Fixed typo
This commit is contained in:
unknown 2001-11-03 15:18:09 +02:00
commit b2cec26dfb
14 changed files with 121 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/mysqladmin.c
View file

@ -23,7 +23,7 @@
#include <my_pthread.h> /* because of signal() */
#endif
#define ADMIN_VERSION "8.22"
#define ADMIN_VERSION "8.23"
#define MAX_MYSQL_VAR 64
#define SHUTDOWN_DEF_TIMEOUT 3600 /* Wait for shutdown */
#define MAX_TRUNC_LENGTH 3
@ -1130,7 +1130,7 @@ static void wait_pidfile(char *pidfile)
system_filename(buff,pidfile);
while ((fd = my_open(buff, O_RDONLY, MYF(0))) >= 0 &&
count++ < opt_shutdown_timeout)
count++ < opt_shutdown_timeout && !interrupted)
{
my_close(fd,MYF(0));
sleep(1);