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

Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql

parents 626f5bff f94d84a9

Docs/manual.texi

+8 −0
Original line number Diff line number Diff line
@@ -46913,6 +46913,14 @@ not yet 100% confident in this code. 














@itemize @bullet















@item













Fixed problem with @code{crash-me} and gcc 3.0.4.













@item













Fixed that @code{@@@@unknown_variable} doesn't hang server.













@item













Added @code{@@@@VERSION} as a synonym for @code{VERSION()}.













@item













@code{SHOW VARIABLES LIKE 'xxx'} is now case insensitive.













@item















Fixed timeout for @code{GET_LOCK()} on HPUX with DCE threads.















@item















Fixed memory allocation bug in the glibc library used to build Linux

























libmysql/libmysql.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -675,7 +675,7 @@ static const char *default_options[]=













  "port","socket","compress","password","pipe", "timeout", "user",















  "init-command", "host", "database", "debug", "return-found-rows",















  "ssl-key" ,"ssl-cert" ,"ssl-ca" ,"ssl-capath",













  "character-set-dir", "default-character-set", "interactive-timeout",













  "character-sets-dir", "default-character-set", "interactive-timeout",















  "connect-timeout", "local-infile", "disable-local-infile",















 NullS















};

































myisam/myisampack.c



+1
−2






























Original line number
Diff line number
Diff line








@@ -239,7 +239,6 @@ static struct option long_options[] =













  {"force",	no_argument,	   0, 'f'},















  {"join",	required_argument, 0, 'j'},















  {"help",	no_argument,	   0, '?'},













  {"packlength",required_argument, 0, 'p'},















  {"silent",	no_argument,	   0, 's'},















  {"tmpdir",	required_argument, 0, 'T'},















  {"test",	no_argument,	   0, 't'},









@@ -251,7 +250,7 @@ static struct option long_options[] =





























static void print_version(void)















{













  printf("%s  Ver 1.12 for %s on %s\n",my_progname,SYSTEM_TYPE,MACHINE_TYPE);













  printf("%s  Ver 1.13 for %s on %s\n",my_progname,SYSTEM_TYPE,MACHINE_TYPE);















}































static void usage(void)

































mysql-test/r/identity.result
deleted100644 → 0



+0
−4






























Original line number
Diff line number
Diff line













last_insert_id(345)













345













@@IDENTITY	last_insert_id()













345	345
























mysql-test/r/show_check.result



+2
−0






























Original line number
Diff line number
Diff line








@@ -47,6 +47,8 @@ test.t1	optimize	status	Table is already up to date













Variable_name	Value















wait_timeout	28800















Variable_name	Value













wait_timeout	28800













Variable_name	Value















Name	Type	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Create_options	Comment















Database















mysql