From 95f26f1aa9ea7152a767a11455bc4be734e07eb0 Mon Sep 17 00:00:00 2001 From: "knielsen@mysql.com" <> Date: Fri, 9 Dec 2005 14:38:35 +0100 Subject: [PATCH 01/10] Attempt to fix rpl_relayrotate.test for host openbsd, fix suggested by Guilhem --- mysql-test/t/rpl_relayrotate.test | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mysql-test/t/rpl_relayrotate.test b/mysql-test/t/rpl_relayrotate.test index e9a4cdd05c5..04f03367e20 100644 --- a/mysql-test/t/rpl_relayrotate.test +++ b/mysql-test/t/rpl_relayrotate.test @@ -52,9 +52,8 @@ start slave; # which proves that the transaction restarted at # the right place. # We must wait for the transaction to commit before -# reading, MASTER_POS_WAIT() will do it for sure -# (the only statement with position>=3000 is COMMIT). -select master_pos_wait('master-bin.001',3000)>=0; +# reading: +sync_with_master; select max(a) from t1; connection master; From 2c9ff654a6acf5371e9576f9d017fd4752aefdcc Mon Sep 17 00:00:00 2001 From: "kent@mysql.com" <> Date: Fri, 9 Dec 2005 15:28:20 +0100 Subject: [PATCH 02/10] trigger-grant.test, trigger-compat.test: Removed --text from grep, not portable --- mysql-test/t/trigger-compat.test | 2 +- mysql-test/t/trigger-grant.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/t/trigger-compat.test b/mysql-test/t/trigger-compat.test index ace18639172..c2acc235135 100644 --- a/mysql-test/t/trigger-compat.test +++ b/mysql-test/t/trigger-compat.test @@ -61,7 +61,7 @@ CREATE TRIGGER wl2818_trg1 BEFORE INSERT ON t1 --echo --echo ---> patching t1.TRG... ---exec grep --text -v 'definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG +--exec grep -v 'definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG --exec mv $MYSQL_TEST_DIR/var/tmp/t1.TRG $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG # diff --git a/mysql-test/t/trigger-grant.test b/mysql-test/t/trigger-grant.test index c058816ee75..deeaeacbccc 100644 --- a/mysql-test/t/trigger-grant.test +++ b/mysql-test/t/trigger-grant.test @@ -449,7 +449,7 @@ CREATE TRIGGER trg5 BEFORE DELETE ON t1 FOR EACH ROW SET @a = 5; ---exec egrep --text -v '^definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG +--exec egrep -v '^definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG --exec echo "definers='' '@' '@abc@def@@' '@hostname' '@abcdef@@@hostname'" >> $MYSQL_TEST_DIR/var/tmp/t1.TRG --exec mv $MYSQL_TEST_DIR/var/tmp/t1.TRG $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG From 8eba6be5b736a844a951e305e9fa12fa1256fad3 Mon Sep 17 00:00:00 2001 From: "ramil@mysql.com" <> Date: Fri, 9 Dec 2005 19:55:59 +0400 Subject: [PATCH 03/10] Fix for bug #15602: 5.0.17 test case 'create' failure. --- sql/table.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sql/table.cc b/sql/table.cc index 268d7a0be49..fc75568b615 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1403,13 +1403,12 @@ File create_frm(THD *thd, my_string name, const char *db, if (create_info->options & HA_LEX_CREATE_TMP_TABLE) create_flags|= O_EXCL | O_NOFOLLOW; -#if SIZEOF_OFF_T > 4 /* Fix this when we have new .frm files; Current limit is 4G rows (QQ) */ if (create_info->max_rows > UINT_MAX32) create_info->max_rows= UINT_MAX32; if (create_info->min_rows > UINT_MAX32) create_info->min_rows= UINT_MAX32; -#endif + /* Ensure that raid_chunks can't be larger than 255, as this would cause problems with drop database From cafbf5ac3b86c4a9681f21b8de18c3de0dbbeaaf Mon Sep 17 00:00:00 2001 From: "ramil@mysql.com" <> Date: Fri, 9 Dec 2005 20:18:25 +0400 Subject: [PATCH 04/10] Fix for bug #15605: 5.0.17 test case 'mysqltest' failure. --- mysql-test/t/mysqltest.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index 8ccf2cb0c7a..440a7787985 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -968,9 +968,9 @@ drop table t1; --error 1 --exec $MYSQL_TEST --record -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql -R $MYSQL_TEST_DIR/var/tmp/bug11731.out -# The .out file should be empty, cat will fail! +# The .out file should be empty --error 1 ---exec cat $MYSQL_TEST_DIR/var/tmp/bug11731.out +--exec test -s $MYSQL_TEST_DIR/var/tmp/bug11731.out drop table t1; From cf57f12407a1fdb768ef42df27f103590e317993 Mon Sep 17 00:00:00 2001 From: "kent@mysql.com" <> Date: Sun, 11 Dec 2005 09:21:13 +0100 Subject: [PATCH 05/10] make_win_src_distribution.sh: Removed Visual Studio 6 project files, as they are not maintained --- scripts/make_win_src_distribution.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index 2e93ebcb007..2e312e0c3cf 100644 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -199,7 +199,7 @@ copy_dir_files() print_debug "Creating directory '$arg'" mkdir $BASE/$arg fi - for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.dsp *.dsw \ + for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp \ README INSTALL* LICENSE AUTHORS NEWS ChangeLog \ *.inc *.test *.result *.pem Moscow_leap des_key_file \ *.vcproj *.sln *.dat *.000001 *.require *.opt @@ -340,7 +340,7 @@ mv $BASE/sql/sql_yacc.cpp-new $BASE/sql/sql_yacc.cpp # # Search the tree for plain text files and adapt the line end marker # -find $BASE \( -name "*.dsp" -o -name "*.dsw" -o -name "*.cnf" -o -name "*.ini" \ +find $BASE \( -name "*.cnf" -o -name "*.ini" \ -o -name COPYING -o -name ChangeLog -o -name EXCEPTIONS-CLIENT \ -o -name "INSTALL*" -o -name LICENSE -o -name "README*" \ -o -name "*.vcproj" -o -name "*.sln" \) -type f -print \ From 51184adde3b48396ab85c590d0ecef2e9f3baa54 Mon Sep 17 00:00:00 2001 From: "ramil@mysql.com" <> Date: Mon, 12 Dec 2005 15:57:35 +0400 Subject: [PATCH 06/10] Fix for bug #15630: Test case failure in sp-dynamic, sp-error, and sp. --- sql/sp_head.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 6814bdfa8f2..8369a9611aa 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -911,7 +911,7 @@ void sp_head::recursion_level_error() THD *thd= current_thd; my_error(ER_SP_RECURSION_LIMIT, MYF(0), thd->variables.max_sp_recursion_depth, - m_name); + m_name.str); } else my_error(ER_SP_NO_RECURSION, MYF(0)); From 3e23de493ad3487b1fe3f8d8612ff95eb6d77635 Mon Sep 17 00:00:00 2001 From: "kent@mysql.com" <> Date: Mon, 12 Dec 2005 16:58:20 +0100 Subject: [PATCH 07/10] skip_name_resolve.result, skip_name_resolve.test: Ignore columns with unpredictable values. rpl_relayrotate.result: Changed result file to match change in test --- mysql-test/r/rpl_relayrotate.result | 3 --- mysql-test/r/skip_name_resolve.result | 4 ++-- mysql-test/t/skip_name_resolve.test | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/mysql-test/r/rpl_relayrotate.result b/mysql-test/r/rpl_relayrotate.result index b038e7b6a3e..20f19973d83 100644 --- a/mysql-test/r/rpl_relayrotate.result +++ b/mysql-test/r/rpl_relayrotate.result @@ -10,9 +10,6 @@ reset slave; start slave; stop slave; start slave; -select master_pos_wait('master-bin.001',3000)>=0; -master_pos_wait('master-bin.001',3000)>=0 -1 select max(a) from t1; max(a) 8000 diff --git a/mysql-test/r/skip_name_resolve.result b/mysql-test/r/skip_name_resolve.result index a969c5c9ae0..8ef52e75238 100644 --- a/mysql-test/r/skip_name_resolve.result +++ b/mysql-test/r/skip_name_resolve.result @@ -10,5 +10,5 @@ user() # show processlist; Id User Host db Command Time State Info -# root # test Sleep # NULL -# root # test Query # NULL show processlist + root test