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

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

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
-'MYSQL_TEST_DIR/std_data/numbers.txt' INTO TABLE test.t1;
+'var/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
-'MYSQL_TEST_DIR/std_data/numbers.txt' INTO TABLE test.t1;
+'var/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

@@ -40,6 +40,5 @@ 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");
-ERROR 08S01: Got a packet bigger than 'max_allowed_packet' bytes
 ## Server disconnects after this case and error occurs that Server ##
 ## has gone away ##

mysql-test/t/automatic_sp_privileges_func.test

@@ -24,6 +24,8 @@
 # Setup
 #
 
+--source include/not_embedded.inc
+
 --echo ** Setup **
 SET @global_automatic_sp_privileges = @@GLOBAL.automatic_sp_privileges;
 

mysql-test/t/completion_type_func.test

@@ -84,7 +84,7 @@ COMMIT;
 
 --echo ## Inserting rows should give error here because connection should ##
 --echo ## disconnect after using COMMIT ##
---Error 2006,2013
+--Error 2006,2013,1053
 INSERT into t1(name) values('Record_4');
 
 --echo ## Creating new connection test_con2 ##

mysql-test/t/delayed_insert_limit_func.test

@@ -25,6 +25,8 @@
 # Setup
 #
 
+--source include/not_embedded.inc
+
 --echo Creating connection con0
 connect (con0,localhost,root,,);
 --echo Creating connection con1

mysql-test/t/disabled.def

@@ -19,3 +19,6 @@ ctype_create         : Bug#32965 main.ctype_create fails
 status               : Bug#32966 main.status fails
 ps_ddl               : Bug#12093 2007-12-14 pending WL#4165 / WL#4166
 csv_alter_table      : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
+event_scheduler_basic: BUG#35997 server seems to crash.
+event_scheduler_func: BUG#35997 server seems to crash.
+

mysql-test/t/general_log_file_func.test

@@ -50,7 +50,8 @@ INSERT into t1(name) values('Record_3');
 INSERT into t1(name) values('Record_4');
 
 --echo ## Verifying general log file ##
---file_exists var/master-data/mysql-test.log
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--file_exists $MYSQLTEST_VARDIR/master-data/mysql-test.log
 
 --echo ## Dropping table ##
 DROP TABLE t1;

mysql-test/t/general_log_func.test

@@ -46,7 +46,8 @@ name VARCHAR(30)
 SET @@global.general_log = OFF;
 SELECT @@general_log;
 
---copy_file var/log/master.log var/log/master-test.log
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--copy_file $MYSQLTEST_VARDIR/log/master.log $MYSQLTEST_VARDIR/log/master-test.log
 
 --echo ## Inserting some Records & Verifying output in log ##
 INSERT into t1(name) values('Record_1');
@@ -66,7 +67,8 @@ INSERT into t1(name) values('Record_2');
 SET @@global.general_log = ON;
 SELECT @@general_log;
 
---copy_file var/log/master.log var/log/master-test-1.log
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--copy_file $MYSQLTEST_VARDIR/log/master.log $MYSQLTEST_VARDIR/log/master-test-1.log
 
 --echo ## Inserting some Records & Verifying output in log ##
 INSERT into t1(name) values('Record_3');

mysql-test/t/local_infile_func.test

@@ -62,7 +62,7 @@ create table t1(a int);
 
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 eval LOAD DATA LOCAL INFILE
-'$MYSQL_TEST_DIR/std_data/numbers.txt' INTO TABLE test.t1;
+'var/std_data_ln/numbers.txt' INTO TABLE test.t1;
 
 SELECT count(*) from t1;
 
@@ -79,7 +79,7 @@ create table t1(a int);
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 --Error ER_NOT_ALLOWED_COMMAND
 eval LOAD DATA LOCAL INFILE
-'$MYSQL_TEST_DIR/std_data/numbers.txt' INTO TABLE test.t1;
+'var/std_data_ln/numbers.txt' INTO TABLE test.t1;
 
 SELECT count(*) from t1;
 

mysql-test/t/max_allowed_packet_func.test

@@ -77,7 +77,7 @@ connect (test_con1,localhost,root,,);
 connection test_con1;
 
 --echo ## Inserting and fetching data of length greater than 1024 ## 
---Error ER_NET_PACKET_TOO_LARGE
+--Error 0,ER_NET_PACKET_TOO_LARGE
 INSERT into t1(name) values("aaassssssssddddddddffffffgggggggg, askdlfjalsdkjfalksdjflaksdjfalkjdflaksjdflakjdflajsflajflajdfalsjfdlajfladjslfajdflajdsflajsflakjsdfla;kjflsdjkf;aljfa;lkdsfjla;sjlkajffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllakjsdffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa;;;;;;;;;;;;;;;;;;;;;;;;;;;dsklfjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjkljffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdkskkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk");
 
 --echo ## Server disconnects after this case and error occurs that Server ##

mysql-test/t/max_user_connections_func.test

@@ -26,6 +26,8 @@
 # Setup
 #
 
+--source include/not_embedded.inc
+
 SET @default_max_user_connections = @@max_user_connections;
 
 

mysql-test/t/old_passwords_func.test

@@ -24,6 +24,8 @@
 # Setup
 #
 
+--source include/not_embedded.inc
+
 SET @global_old_passwords = @@GLOBAL.old_passwords;
 SET @session_old_passwords = @@SESSION.old_passwords;
 SET @global_secure_auth = @@GLOBAL.secure_auth;

mysql-test/t/read_only_func.test

@@ -26,6 +26,8 @@
 # Setup
 #
 
+--source include/not_embedded.inc
+
 SET @default_read_only = @@read_only;
 
 --echo '#--------------------FN_DYNVARS_140_01-------------------------#'

mysql-test/t/relay_log_purge_basic.test

@@ -23,6 +23,7 @@
 #                                                                             #
 ###############################################################################
 
+--source include/not_embedded.inc
 --source include/load_sysvars.inc
 
 ##################################################################### 

mysql-test/t/secure_auth_func.test

@@ -29,6 +29,8 @@
 # Setup
 #
 
+--source include/not_embedded.inc
+
 #
 # Save initial value
 #

mysql-test/t/slave_compressed_protocol_basic.test

@@ -23,6 +23,7 @@
 #                                                                             #
 ###############################################################################
 
+--source include/not_embedded.inc
 --source include/load_sysvars.inc
 ######################################################################## 
 #                    START OF slave_compressed_protocol TESTS          #

mysql-test/t/slave_net_timeout_basic.test

@@ -23,6 +23,7 @@
 #                                                                             #
 ###############################################################################
 
+--source include/not_embedded.inc
 --source include/load_sysvars.inc
 ###########################################################
 #           START OF slave_net_timeout TESTS              #

mysql-test/t/slow_launch_time_func.test

@@ -24,6 +24,8 @@
 # Setup
 #
 
+--source include/not_embedded.inc
+
 SET @global_slow_launch_time = @@GLOBAL.slow_launch_time;
 
 

mysql-test/t/slow_query_log_file_func.test

@@ -26,6 +26,7 @@
 ####################################################################
 
 --echo ## --file_exists var/master-data/my_slow_test.log ##
---file_exists var/master-data/my_slow_test.log
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--file_exists $MYSQLTEST_VARDIR/master-data/my_slow_test.log
 
 --echo ## This case should pass because we have set this filename in opt file ##

mysql-test/t/sql_slave_skip_counter_basic.test

@@ -23,6 +23,7 @@
 #                                                                             #
 ###############################################################################
 
+--source include/not_embedded.inc
 --source include/load_sysvars.inc
 
 ################################################################

mysql-test/t/ssl_ca_basic.test

@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_ssl.inc
+
 --echo '#---------------------BS_STVARS_045_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #

mysql-test/t/ssl_cert_basic.test

@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_ssl.inc
+
 --echo '#---------------------BS_STVARS_047_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #

mysql-test/t/ssl_key_basic.test

@@ -22,6 +22,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/have_ssl.inc
+
 --echo '#---------------------BS_STVARS_049_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #

mysql-test/t/thread_cache_size_func.test

@@ -26,6 +26,8 @@
 # Setup
 #
 
+--source include/not_embedded.inc
+
 SET @global_thread_cache_size = @@GLOBAL.thread_cache_size;
 
 FLUSH STATUS;

mysql-test/t/wait_timeout_func.test

@@ -19,6 +19,8 @@
 #                                                                             #
 ###############################################################################
 
+--source include/not_embedded.inc
+
 --disable_warnings
 drop table if exists t1;
 --enable_warnings