Commit 8cd4c235 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fix that mysqladmin shutdown can be interrupted with ^C 

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
parent daa4229a

Docs/manual.texi

+69 −10
Original line number Diff line number Diff line
@@ -46791,6 +46791,7 @@ users use this code as the rest of the code and because of this we are 
not yet 100% confident in this code.















@menu













* News-3.23.45::                Changes in release 3.23.45















* News-3.23.44::                Changes in release 3.23.44















* News-3.23.43::                Changes in release 3.23.43















* News-3.23.42::                Changes in release 3.23.42










@@ -46839,7 +46840,18 @@ not yet 100% confident in this code.













* News-3.23.0::                 Changes in release 3.23.0















@end menu



























@node News-3.23.44, News-3.23.43, News-3.23.x, News-3.23.x













@node News-3.23.45, News-3.23.44, News-3.23.x, News-3.23.x













@appendixsubsec Changes in release 3.23.45













@itemize @bullet













@item













Fixed bug with BDB tables and keys on @code{BLOB}'s.













@item













Fixed bug in @code{MERGE} tables on OS with 32 bit file pointers.













@item













Fixed bug in @code{TIME_TO_SEC()} when using negative values.













@end itemize

























@node News-3.23.44, News-3.23.43, News-3.23.45, News-3.23.x















@appendixsubsec Changes in release 3.23.44















@itemize @bullet















@item









@@ -46861,10 +46873,6 @@ Fixed problem with sjis character strings used within quoted table names.













Fixed coredump when using @code{CREATE ... FULLTEXT} keys with other table















handlers than MyISAM.















@item













Add missing @code{InnoDB} variables to @code{SHOW VARIABLES}.













@item













Foreign keys checking is now done for @code{InnoDB} tables.













@item















Don't use @code{signal()} on windows because this appears to not be















100 % reliable.















@item









@@ -46881,6 +46889,57 @@ a core dump.













Applied portability fixes for OS/2 (Patch by Yuri Dario).















@end itemize



























The following changes are for @code{InnoDB} tables:

























@itemize @bullet













@item













Add missing @code{InnoDB} variables to @code{SHOW VARIABLES}.













@item













Foreign keys checking is now done for @code{InnoDB} tables.













@item













@code{DROP DATABASE} now works also for @code{InnoDB} tables.













@item













@code{InnoDB} now supports data files and raw disk partitions bigger













than 4 GB on those operating systems which have big files.













@item













@code{InnoDB} calculates better table cardinality estimates for the













MySQL optimizer.













@item













Accent characters in the default character set latin1 are ordered













according to the MySQL ordering.

























NOTE: if you are using latin1 and have inserted characters whose code is >













127 to an indexed CHAR column, you should run CHECK TABLE on your table when













you upgrade to 3.23.44, and drop and reimport the table if CHECK TABLE













reports an error!













@item













A new @file{my.cnf} parameter @code{innodb_thread_concurrency} helps in













performance tuning in heavily concurrent environments.













@item













A new @code{my.cnf} parameter @code{innodb_fast_shutdown} speeds up













server shutdown.













@item













A new @code{my.cnf} parameter @code{innodb_force_recovery} helps to save













your data in case the disk image of the database becomes corrupt.













@item













@code{innodb_monitor} has been improved and a new













@code{innodb_table_monitor} added.













@item













Increased maximum key length from 500 to 7000 bytes.













@item













Fixed a bug in replication of auto-inc columns with multiline inserts.













@item













Fixed a bug when the case of letters changes in an update of an indexed













secondary column.













@item













Fixed a hang when there are > 24 data files.













@item













Fixed a crash when @code{MAX(col)} is selected from an empty table, and













col is a not the first column in a multi-column index.













@item













Fixed a bug in purge which could cause crashes.













@end itemize



























@node News-3.23.43, News-3.23.42, News-3.23.44, News-3.23.x















@appendixsubsec Changes in release 3.23.43















@itemize @bullet










@@ -46981,15 +47040,15 @@ Fixed possible problem with @code{shutdown} on Solaris where the













@item















InnoDB now supports < 4 GB rows. The former limit was 8000 bytes.















@item













The @code{doublewrite} file flush method is used in InnoDB.













The @code{doublewrite} file flush method is used in @code{InnoDB}.















It reduces the need for Unix fsync calls to a fraction and















improves performance on most Unix flavors.















@item













You can now use the InnoDB Monitor to print a lot of InnoDB state













You can now use the @code{InnoDB} Monitor to print a lot of @code{InnoDB} state















information, including locks, to the standard output; useful in















performance tuning.















@item













Several bugs which could cause hangs in InnoDB have been fixed.













Several bugs which could cause hangs in @code{InnoDB} have been fixed.















@item















Split @code{record_buffer} to @code{record_buffer} and















@code{record_rnd_buffer}.  To make things compatible to previous MySQL










@@ -47103,7 +47162,7 @@ Extended argument length in option files from 256 to 512 chars.













Fixed problem with shutdown when @code{INSERT DELAYED} was waiting for















a @code{LOCK TABLE}.















@item













Fixed coredump bug in InnoDB when tablespace was full.













Fixed coredump bug in @code{InnoDB} when tablespace was full.















@item















Fixed problem with @code{MERGE} tables and big tables (> 4G) when using















@code{ORDER BY}.










@@ -47148,7 +47207,7 @@ New program @code{mysqlcheck}.













Added database name to output for administrative commands like @code{CHECK},















@code{REPAIR}, @code{OPTIMIZE}.















@item













Lots of portability fixes for InnoDB.













Lots of portability fixes for @code{InnoDB}.















@item















Changed optimizer so that queries like















@code{SELECT * FROM table_name,table_name2 ... ORDER BY key_part1 LIMIT #}

























client/mysqladmin.c



+2
−2






























Original line number
Diff line number
Diff line








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

































include/mysqld_error.h



+1
−1






























Original line number
Diff line number
Diff line








@@ -211,7 +211,7 @@













#define ER_DROP_DB_WITH_READ_LOCK 1208















#define ER_CREATE_DB_WITH_READ_LOCK 1209















#define ER_WRONG_ARGUMENTS 1210













#define ER_NO_PERMISSON_TO_CREATE_USER 1211













#define ER_NO_PERMISSION_TO_CREATE_USER 1211















#define ER_UNION_TABLES_IN_DIFFERENT_DIR 1212















#define ER_LOCK_DEADLOCK 1213















#define ER_TABLE_CANT_HANDLE_FULLTEXT 1214

































mysql-test/r/func_time.result



+2
−0






























Original line number
Diff line number
Diff line








@@ -8,6 +8,8 @@ from_unixtime(unix_timestamp("1994-03-02 10:11:12"))	from_unixtime(unix_timestam













1994-03-02 10:11:12	1994-03-02 10:11:12	19940302101112















sec_to_time(9001)	sec_to_time(9001)+0	time_to_sec("15:12:22")	sec_to_time(time_to_sec("0:30:47")/6.21)















02:30:01	23001	54742	00:04:57













sec_to_time(time_to_sec('-838:59:59'))













-838:59:59















now()-curdate()*1000000-curtime()















0















strcmp(current_timestamp(),concat(current_date()," ",current_time()))

































mysql-test/t/func_time.test



+1
−0






























Original line number
Diff line number
Diff line








@@ -9,6 +9,7 @@ select now()-now(),weekday(curdate())-weekday(now()),unix_timestamp()-unix_times













select from_unixtime(unix_timestamp("1994-03-02 10:11:12")),from_unixtime(unix_timestamp("1994-03-02 10:11:12"),"%Y-%m-%d %h:%i:%s"),from_unixtime(unix_timestamp("1994-03-02 10:11:12"))+0;















select sec_to_time(9001),sec_to_time(9001)+0,time_to_sec("15:12:22"),















  sec_to_time(time_to_sec("0:30:47")/6.21);













select sec_to_time(time_to_sec('-838:59:59'));















select now()-curdate()*1000000-curtime();















select strcmp(current_timestamp(),concat(current_date()," ",current_time()));















select date_format("1997-01-02 03:04:05", "%M %W %D %Y %y %m %d %h %i %s %w");