Commit d2b07732 authored by monty@mashka.mysql.fi's avatar monty@mashka.mysql.fi
Browse files

Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0

parents c44c70fc ce4b584a

Docs/manual.texi

+21 −6
Original line number Diff line number Diff line
@@ -31258,8 +31258,8 @@ stored into a temporary table) is calculated in MySQL Version 
@item expr2 or expr3 returns an integer @tab integer

@end multitable









If expr2 and expr3 are strings, then the result is case-sensitive if









both strings are case-sensitive. (Starting from 3.23.51)









If expr2 and expr3 are strings, then the result is case-insensitive if









both strings are case-insensitive. (Starting from 3.23.51)

















@findex CASE









@item CASE value WHEN [compare-value] THEN result [WHEN [compare-value] THEN result ...] [ELSE result] END








@@ -33249,6 +33249,12 @@ mysql> SELECT 1+'1';







       -> 2









@end example

















If you use a number in string context the number will automaticly be









converted to a @code{BINARY} string.

















mysql> SELECT concat("hello you ",2);









       ->  "hello you 2"

















MySQL supports arithmetic with both signed and unsigned 64-bit values.









If you are using an numerical operations (like @code{+}) and one of the









operands are @code{unsigned integer}, then the result will be unsigned.








@@ -50442,7 +50448,15 @@ each individual 4.0.x release.















@itemize @bullet









@item









Fixed overrun bug when calling @code{AES_DECRYPT()} with wrong arguments









Increased max possible @code{max_allowed_packet} in @code{mysqld} to 1G.









@item









Fixed bug when doing a multi-line @code{INSERT} on a table with an









auto_increment key which was not in the first part of the key.









@item









Changed @code{LOAD DATA INFILE} to not recreate index if the table had









rows from before.









@item









Fixed overrun bug when calling @code{AES_DECRYPT()} with wrong arguments.









@item









@code{--skip-ssl} can now be used to disable SSL in the MySQL clients,









even if one is using other ssl options in a options file or previously








@@ -50502,8 +50516,9 @@ Fixed a bug in my_getopt; --set-variable syntax didn't work for







those options that didn't have a valid variable in my_option struct.









This affected at least @code{default-table-type} option.









@item









Fixed a bug that caused @code{REPAIR TABLE} to fail on tables









with duplicates in a unique key.









Fixed a bug from 4.0.2 that caused @code{REPAIR TABLE} and









@code{myisamchk --repair} to fail on tables with duplicates in a unique









key.









@item









Fixed a bug from 4.0.3 in calculating the default field type for some









functions. This affected queries of type @code{CREATE TABLE table_name

























client/mysqlbinlog.cc



+2
−1






























Original line number
Diff line number
Diff line







@@ -407,7 +407,8 @@ static void dump_local_log_entries(const char* logname)







  File fd = -1;









  IO_CACHE cache,*file= &cache;









  ulonglong rec_count = 0;









  char last_db[FN_REFLEN+1], tmp_buff[BIN_LOG_HEADER_SIZE];









  char last_db[FN_REFLEN+1];









  byte tmp_buff[BIN_LOG_HEADER_SIZE];









  bool old_format = 0;



















  last_db[0]=0;
































client/mysqldump.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -232,7 +232,7 @@ static struct my_option my_long_options[] =







   NO_ARG, 0, 0, 0, 0, 0, 0},









  {"max_allowed_packet", OPT_MAX_ALLOWED_PACKET, "",









    (gptr*) &max_allowed_packet, (gptr*) &max_allowed_packet, 0,









    GET_ULONG, REQUIRED_ARG, 24*1024*1024, 4096, 512*1024L*1024L,









    GET_ULONG, REQUIRED_ARG, 24*1024*1024, 4096, 1024*1024L*1024L,









    MALLOC_OVERHEAD, 1024, 0},









  {"net_buffer_length", OPT_NET_BUFFER_LENGTH, "",









    (gptr*) &net_buffer_length, (gptr*) &net_buffer_length, 0,
































include/Makefile.am



+2
−2






























Original line number
Diff line number
Diff line







@@ -20,8 +20,8 @@ pkginclude_HEADERS =	dbug.h m_string.h my_sys.h my_list.h \







			mysql.h mysql_com.h mysqld_error.h mysql_embed.h \









		  	my_semaphore.h my_pthread.h my_no_pthread.h raid.h \









			errmsg.h my_global.h my_net.h my_alloc.h \









			my_getopt.h sslopt-longopts.h sslopt-usage.h \









			sslopt-vars.h $(BUILT_SOURCES)









			my_getopt.h sslopt-longopts.h \









			sslopt-vars.h sslopt-case.h $(BUILT_SOURCES)









noinst_HEADERS =	config-win.h config-os2.h \









			nisam.h heap.h merge.h my_bitmap.h\









			myisam.h myisampack.h myisammrg.h ft_global.h\
































include/my_base.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -107,6 +107,7 @@ enum ha_extra_function {







  HA_EXTRA_NO_IGNORE_DUP_KEY,









  HA_EXTRA_DONT_USE_CURSOR_TO_UPDATE,	/* Cursor will not be used for update */









  HA_EXTRA_BULK_INSERT_BEGIN,









  HA_EXTRA_BULK_INSERT_FLUSH,		/* Flush one index */









  HA_EXTRA_BULK_INSERT_END,









  HA_EXTRA_PREPARE_FOR_DELETE









};