From 679b907964acdc49335cb6a458a85ee60b7ac561 Mon Sep 17 00:00:00 2001 From: "hhunger@hh-nb.hungers" <> Date: Tue, 15 Apr 2008 15:44:11 +0200 Subject: [PATCH] Third set of fixes for bug#35988. --- mysql-test/include/charset_basic.inc | 1 + mysql-test/include/collation_basic.inc | 2 +- mysql-test/r/delay_key_write_func.result | 1 + mysql-test/r/ft_boolean_syntax_func.result | 1 + mysql-test/r/local_infile_func.result | 4 ++-- mysql-test/r/max_allowed_packet_func.result | 2 ++ mysql-test/t/character_set_client_basic.test | 1 + mysql-test/t/delay_key_write_func.test | 1 + mysql-test/t/ft_boolean_syntax_func.test | 1 + mysql-test/t/local_infile_func.test | 8 ++++---- mysql-test/t/max_allowed_packet_func.test | 6 ++++++ 11 files changed, 21 insertions(+), 7 deletions(-) diff --git a/mysql-test/include/charset_basic.inc b/mysql-test/include/charset_basic.inc index ebe3b8633cb..e3331697f2c 100644 --- a/mysql-test/include/charset_basic.inc +++ b/mysql-test/include/charset_basic.inc @@ -4,6 +4,7 @@ +--Error 0,ER_UNKNOWN_CHARACTER_SET eval SET $charset_variable = big5; eval SELECT $charset_variable; eval SET $charset_variable = dec8; diff --git a/mysql-test/include/collation_basic.inc b/mysql-test/include/collation_basic.inc index 5e983ad3163..be8ae36eeb8 100644 --- a/mysql-test/include/collation_basic.inc +++ b/mysql-test/include/collation_basic.inc @@ -1,7 +1,7 @@ # # This auxiliary file is used by collation variables # - +--Error 0,ER_UNKNOWN_CHARACTER_SET eval SET $collation_variable = big5_chinese_ci; eval SELECT $collation_variable; eval SET $collation_variable = big5_bin; diff --git a/mysql-test/r/delay_key_write_func.result b/mysql-test/r/delay_key_write_func.result index fdeaece3457..ca4e25e08b1 100644 --- a/mysql-test/r/delay_key_write_func.result +++ b/mysql-test/r/delay_key_write_func.result @@ -63,4 +63,5 @@ Key_write_requests 9 select count(*) from t1; count(*) 9 +DROP PROCEDURE sp_addRecords; DROP TABLE t1; diff --git a/mysql-test/r/ft_boolean_syntax_func.result b/mysql-test/r/ft_boolean_syntax_func.result index de127d7a38d..4a3159c77c3 100644 --- a/mysql-test/r/ft_boolean_syntax_func.result +++ b/mysql-test/r/ft_boolean_syntax_func.result @@ -105,3 +105,4 @@ id title body 9 Database Security Configuring MySQL for ... 'Bug#35361: Different syntax does not produce result as default operators' SET @@global.ft_boolean_syntax=DEFAULT; +DROP TABLE articles; diff --git a/mysql-test/r/local_infile_func.result b/mysql-test/r/local_infile_func.result index ef0a5039a88..52b922bc6d9 100644 --- a/mysql-test/r/local_infile_func.result +++ b/mysql-test/r/local_infile_func.result @@ -18,7 +18,7 @@ SET @@global.local_infile = 1; DROP TABLE IF EXISTS t1; create table t1(a int); LOAD DATA LOCAL INFILE -'var/std_data_ln/numbers.txt' INTO TABLE test.t1; +'MYSQLTEST_VARDIR/std_data_ln/numbers.txt' INTO TABLE test.t1; SELECT count(*) from t1; count(*) 9 @@ -27,7 +27,7 @@ SET @@global.local_infile = 0; DROP TABLE IF EXISTS t1; create table t1(a int); LOAD DATA LOCAL INFILE -'var/std_data_ln/numbers.txt' INTO TABLE test.t1; +'MYSQLTEST_VARDIR/std_data_ln/numbers.txt' INTO TABLE test.t1; ERROR 42000: The used command is not allowed with this MySQL version SELECT count(*) from t1; count(*) diff --git a/mysql-test/r/max_allowed_packet_func.result b/mysql-test/r/max_allowed_packet_func.result index 32464f87048..f37705e41b4 100644 --- a/mysql-test/r/max_allowed_packet_func.result +++ b/mysql-test/r/max_allowed_packet_func.result @@ -1,3 +1,4 @@ +1048576 drop table if exists t1; ## Creating new table t1 ## CREATE TABLE t1 @@ -40,5 +41,6 @@ SELECT @@global.net_buffer_length; ## Creating new connection test_con1 ## ## Inserting and fetching data of length greater than 1024 ## INSERT into t1(name) values("aaassssssssddddddddffffffgggggggg, askdlfjalsdkjfalksdjflaksdjfalkjdflaksjdflakjdflajsflajflajdfalsjfdlajfladjslfajdflajdsflajsflakjsdfla;kjflsdjkf;aljfa;lkdsfjla;sjlkajffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllakjsdffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa;;;;;;;;;;;;;;;;;;;;;;;;;;;dsklfjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjkljffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdkskkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"); +SET @@global.max_allowed_packet = 1048576; ## Server disconnects after this case and error occurs that Server ## ## has gone away ## diff --git a/mysql-test/t/character_set_client_basic.test b/mysql-test/t/character_set_client_basic.test index ba330903528..7eaee2e28b4 100644 --- a/mysql-test/t/character_set_client_basic.test +++ b/mysql-test/t/character_set_client_basic.test @@ -114,6 +114,7 @@ SET @@character_set_client = utf8 + latin2; ############################################################################## # Change the value of character_set_client to a valid value for session # ############################################################################## +--Error 0,ER_UNKNOWN_CHARACTER_SET SET @@character_set_client = big5; SELECT @@character_set_client; SET @@character_set_client = dec8; diff --git a/mysql-test/t/delay_key_write_func.test b/mysql-test/t/delay_key_write_func.test index a361bf1f54c..3c0319be427 100644 --- a/mysql-test/t/delay_key_write_func.test +++ b/mysql-test/t/delay_key_write_func.test @@ -141,6 +141,7 @@ SHOW STATUS LIKE 'Key_writes'; SHOW STATUS LIKE 'Key_write_requests'; select count(*) from t1; +DROP PROCEDURE sp_addRecords; DROP TABLE t1; #################################################### diff --git a/mysql-test/t/ft_boolean_syntax_func.test b/mysql-test/t/ft_boolean_syntax_func.test index 7b30868224c..4ea28b015cb 100644 --- a/mysql-test/t/ft_boolean_syntax_func.test +++ b/mysql-test/t/ft_boolean_syntax_func.test @@ -122,4 +122,5 @@ SET @@global.ft_boolean_syntax=DEFAULT; ######################################################### # End of functionality Testing for ft_boolean_syntax # ######################################################### +DROP TABLE articles; diff --git a/mysql-test/t/local_infile_func.test b/mysql-test/t/local_infile_func.test index d0a5a45e9c6..166149ad9aa 100644 --- a/mysql-test/t/local_infile_func.test +++ b/mysql-test/t/local_infile_func.test @@ -62,9 +62,9 @@ DROP TABLE IF EXISTS t1; create table t1(a int); ---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR eval LOAD DATA LOCAL INFILE -'var/std_data_ln/numbers.txt' INTO TABLE test.t1; +'$MYSQLTEST_VARDIR/std_data_ln/numbers.txt' INTO TABLE test.t1; SELECT count(*) from t1; @@ -78,10 +78,10 @@ DROP TABLE IF EXISTS t1; --enable_warnings create table t1(a int); ---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --Error ER_NOT_ALLOWED_COMMAND eval LOAD DATA LOCAL INFILE -'var/std_data_ln/numbers.txt' INTO TABLE test.t1; +'$MYSQLTEST_VARDIR/std_data_ln/numbers.txt' INTO TABLE test.t1; SELECT count(*) from t1; diff --git a/mysql-test/t/max_allowed_packet_func.test b/mysql-test/t/max_allowed_packet_func.test index e71019f4884..4474786d898 100644 --- a/mysql-test/t/max_allowed_packet_func.test +++ b/mysql-test/t/max_allowed_packet_func.test @@ -20,6 +20,8 @@ ############################################################################### +let $start_global_value = `SELECT @@global.max_allowed_packet`; +--echo $start_global_value --disable_warnings drop table if exists t1; @@ -80,5 +82,9 @@ connection test_con1; --Error 0,ER_NET_PACKET_TOO_LARGE INSERT into t1(name) values("aaassssssssddddddddffffffgggggggg, askdlfjalsdkjfalksdjflaksdjfalkjdflaksjdflakjdflajsflajflajdfalsjfdlajfladjslfajdflajdsflajsflakjsdfla;kjflsdjkf;aljfa;lkdsfjla;sjlkajffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllakjsdffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa;;;;;;;;;;;;;;;;;;;;;;;;;;;dsklfjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjkljffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdkskkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk"); +eval SET @@global.max_allowed_packet = $start_global_value; + --echo ## Server disconnects after this case and error occurs that Server ## --echo ## has gone away ## + +