Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean

into  hh-nb.hungers:/work/merge/mysql-5.1-build

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;

mysql-test/include/collation_basic.inc

 #
 # 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;

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;

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;

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(*)

mysql-test/r/max_allowed_packet_func.result

+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 ##

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;

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;
 
 ####################################################

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;
 

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;
 

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 ##
+
+