Commit cb2f04ca 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 745d170f 9c123d0c

Docs/manual.texi

+9 −0
Original line number Diff line number Diff line
@@ -50448,6 +50448,9 @@ each individual 4.0.x release. 














@itemize @bullet















@item













@code{SET PASSWORD FOR ...} closed the connection in case of errors (bug













from 4.0.3).













@item















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










@@ -51252,10 +51255,16 @@ not yet 100% confident in this code.













@item















Fixed core dump bug when using the @code{BINARY} cast on a @code{NULL} value.















@item













Fixed race condition when someone did a @code{GRANT} at the same time a new













user logged in or did a @code{USE DATABASE}.













@item















Fixed bug in @code{ALTER TABLE} and @code{RENAME TABLE} when running with















@code{-O lower_case_table_names=1} (typically on windows) when giving the















table name in uppercase.















@item













Fixed that @code{-O lower_case_table_names=1} also converts database













names to lower case.













@item















Fixed unlikely core dump with @code{SELECT ... ORDER BY ... LIMIT}.















@item















Changed @code{AND/OR} to report that they can return NULL. This fixes a

























client/mysql.cc



+3
−3






























Original line number
Diff line number
Diff line








@@ -40,7 +40,7 @@













#include <signal.h>















#include <violite.h>





























const char *VER= "12.13";













const char *VER= "12.14";































/* Don't try to make a nice table if the data is too big */















#define MAX_COLUMN_LENGTH	     1024










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













  {"ignore-space", 'i', "Ignore space after function names.", 0, 0, 0,















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















  {"local-infile", OPT_LOCAL_INFILE, "Enable/disable LOAD DATA LOCAL INFILE.",













   0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},













   (gptr*) &opt_local_infile,













   (gptr*) &opt_local_infile, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},















  {"no-beep", 'b', "Turn off beep on error.", (gptr*) &opt_nobeep,















   (gptr*) &opt_nobeep, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, 















  {"host", 'h', "Connect to host.", (gptr*) &current_host,










@@ -609,7 +610,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),













    break;















  case OPT_LOCAL_INFILE:















    using_opt_local_infile=1;













    opt_local_infile= test(!argument || atoi(argument)>0);















    break;















  case OPT_TEE:















    if (argument == disabled_my_option)

































configure.in



+4
−1






























Original line number
Diff line number
Diff line








@@ -454,6 +454,8 @@ fi













NOINST_LDFLAGS=































static_nss=""













STATIC_NSS_FLAGS=""













OTHER_LIBC_LIB=""















AC_ARG_WITH(other-libc,















 [  --with-other-libc=DIR   Link against libc and other standard libraries 















                          installed in the specified non-standard location 









@@ -479,6 +481,7 @@ AC_ARG_WITH(other-libc,













     # we need special flags, but we will have to add those later















     STATIC_NSS_FLAGS="-Wl,--start-group -lc -lnss_files -lnss_dns -lresolv \















  -Wl,--end-group"













     OTHER_LIBC_LIB="-L$other_libc_lib"















     static_nss=1















   else















     # this is a dirty hack. We if we detect static nss glibc in the special










@@ -2390,7 +2393,7 @@ fi





























if test "$static_nss" = "1"















then













 LDFLAGS="$LDFLAGS -static -L$other_libc_lib " 













 LDFLAGS="$LDFLAGS -static $OTHER_LIBC_LIB" 















 LIBS="$LIBS $STATIC_NSS_FLAGS"















fi  

















































mysql-test/r/rpl_rotate_logs.result



+1
−1






























Original line number
Diff line number
Diff line








@@ -80,4 +80,4 @@ select count(*) from t3 where n >= 4;













count(*)















100















unlock tables;













drop table if exists t1,t2,t3;












drop table if exists t1,t2,t3,t4;
























mysql-test/t/rpl_rotate_logs.test



+1
−1






























Original line number
Diff line number
Diff line








@@ -139,7 +139,7 @@ select count(*) from t3 where n >= 4;













unlock tables;















#clean up















connection master;













drop table if exists t1,t2,t3;













drop table if exists t1,t2,t3,t4;















save_master_pos;















connection slave;















sync_with_master;