From 4868875ceca1c751ed5ea60340d7feb51cdcdd2f Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 2 Nov 2006 13:33:26 +0100 Subject: [PATCH 1/6] Bug#22828 complementary patch: - 'false' not defined in C, use FALSE instead. mysys/my_lock.c: Fixed error in windows built: 'false' not defined in C, use FALSE instead. --- mysys/my_lock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysys/my_lock.c b/mysys/my_lock.c index c9641f46f5c..b8307f366c0 100644 --- a/mysys/my_lock.c +++ b/mysys/my_lock.c @@ -111,7 +111,7 @@ int my_lock(File fd, int locktype, my_off_t start, my_off_t length, #elif defined(HAVE_LOCKING) /* Windows */ { - my_bool error= false; + my_bool error= FALSE; pthread_mutex_lock(&my_file_info[fd].mutex); if (MyFlags & MY_SEEK_NOT_DONE) { From 24232ff032786d730d022950c4ccb40d422c7ce9 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 2 Nov 2006 21:58:42 +0100 Subject: [PATCH 2/6] configure.in: Raise version number to 4.1.23 configure.in: Raise version number to 4.1.23 --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 6cccb1bb90e..eb1d601cf95 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! # remember to also change ndb version below and update version.c in ndb -AM_INIT_AUTOMAKE(mysql, 4.1.22) +AM_INIT_AUTOMAKE(mysql, 4.1.23) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 @@ -17,7 +17,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 # ndb version NDB_VERSION_MAJOR=4 NDB_VERSION_MINOR=1 -NDB_VERSION_BUILD=22 +NDB_VERSION_BUILD=23 NDB_VERSION_STATUS="" # Set all version vars based on $VERSION. How do we do this more elegant ? From 65e3646258bb2700d1c0e70af343a9c8c5c160be Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 2 Nov 2006 18:27:52 -0500 Subject: [PATCH 3/6] Fix merge collision. --- mysys/mf_iocache.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 109d9fabda3..b17df3da260 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -963,13 +963,13 @@ int _my_b_read_r(register IO_CACHE *cache, byte *Buffer, uint Count) "seek_not_done" to indicate this to other functions operating on the IO_CACHE. */ - if (info->seek_not_done) + if (cache->seek_not_done) { - if (my_seek(info->file,pos_in_file,MY_SEEK_SET,MYF(0)) + if (my_seek(cache->file,pos_in_file,MY_SEEK_SET,MYF(0)) == MY_FILEPOS_ERROR) { - info->error= -1; - unlock_io_cache(info); + cache->error= -1; + unlock_io_cache(cache); DBUG_RETURN(1); } } From 16a671c0213ed17975ce1f87e589308217a142a8 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 3 Nov 2006 15:26:42 +0100 Subject: [PATCH 4/6] Don't warn about "Found non pid file" for elements that are not files. --- mysql-test/lib/mtr_process.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index 048c336f8a3..9d0c1f601ba 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -441,7 +441,6 @@ sub mtr_kill_leftovers () { # Only read pid from files that end with .pid if ( $elem =~ /.*[.]pid$/) { - my $pidfile= "$rundir/$elem"; if ( -f $pidfile ) @@ -465,7 +464,8 @@ sub mtr_kill_leftovers () { } else { - mtr_warning("Found non pid file $elem in $rundir"); + mtr_warning("Found non pid file $elem in $rundir") + if -f "$rundir/$elem"; next; } } From 8cd64ad21824b6fcd1a5b221cf0cca34520d63a3 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 3 Nov 2006 16:06:13 +0100 Subject: [PATCH 5/6] Fix DBUG_PRINT in mysqltest, the real value to print is in ds_cmd client/mysqltest.c: The expanded command executed by mysqltest is in ds_cmd --- client/mysqltest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/mysqltest.c b/client/mysqltest.c index 7c1ce19283f..aeb86575333 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1511,7 +1511,7 @@ void do_exec(struct st_command *command) do_eval(&ds_cmd, cmd, command->end, TRUE); DBUG_PRINT("info", ("Executing '%s' as '%s'", - command->first_argument, cmd)); + command->first_argument, ds_cmd.str)); if (!(res_file= my_popen(&ds_cmd, "r")) && command->abort_on_error) die("popen(\"%s\", \"r\") failed", command->first_argument); From 52f70ab8762c73abf8874c1f0440501de70d30b9 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 3 Nov 2006 16:09:16 +0100 Subject: [PATCH 6/6] Fix problem with mysql.test relying on "echo" behaviour mysql-test/r/mysql.result: Update test result after commenting out the test mysql-test/t/mysql.test: Rewrite the test commands so they don't depend on "echo" behaviour Comment out one as it's a duplicate --- mysql-test/r/mysql.result | 1 - mysql-test/t/mysql.test | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index 8e0a7adcebb..14267afc27e 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -174,7 +174,6 @@ ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errn ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno) The commands reported in the bug report ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno) -ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno) Too long dbname ERROR 1049 (42000) at line 1: Unknown database 'test_really_long_dbnamexxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' Too long hostname diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index 929f3226c49..c06e52e2d78 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -210,17 +210,17 @@ drop table t17583; --error 1 --exec $MYSQL test -e "\r\r\n\r\n cyril\ has\ found\ a\ bug\ :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" 2>&1 ---replace_regex /\([0-9]*\)/(errno)/ ---error 1 ---exec echo '\r\r\n\r\n cyril\ has\ found\ a\ bug\ :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' | $MYSQL 2>&1 +#--replace_regex /\([0-9]*\)/(errno)/ +#--error 1 +#--exec echo '\r\r\n\r\n cyril\ has\ found\ a\ bug\ :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' | $MYSQL 2>&1 --echo Too long dbname --error 1 ---exec echo '\r test_really_long_dbnamexxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx localhost' | $MYSQL 2>&1 +--exec $MYSQL test -e "\r test_really_long_dbnamexxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx localhost" 2>&1 --echo Too long hostname --replace_regex /\([0-9]*\)/(errno)/ --error 1 ---exec echo '\r test cyrils_superlonghostnameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' | $MYSQL 2>&1 +--exec $MYSQL test -e "\r test cyrils_superlonghostnameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" 2>&1 --echo End of 5.0 tests