Below is the list of changes that have just been committed into a local
5.1 repository of hhunger. When hhunger does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2008-04-11 21:59:33+02:00, hhunger@stripped +25 -0
Fixes of system variable test programs for bug#35988.
mysql-test/r/local_infile_func.result@stripped, 2008-04-11 21:59:28+02:00, hhunger@stripped +2 -2
Fixes of system variable test programs for bug#35988.
mysql-test/r/max_allowed_packet_func.result@stripped, 2008-04-11 21:59:29+02:00, hhunger@stripped +0 -1
Fixes of system variable test programs for bug#35988.
mysql-test/t/automatic_sp_privileges_func.test@stripped, 2008-04-11 21:59:29+02:00, hhunger@stripped +2 -0
Fixes of system variable test programs for bug#35988.
mysql-test/t/completion_type_func.test@stripped, 2008-04-11 21:59:29+02:00, hhunger@stripped +1 -1
Fixes of system variable test programs for bug#35988.
mysql-test/t/delayed_insert_limit_func.test@stripped, 2008-04-11 21:59:29+02:00, hhunger@stripped +2 -0
Fixes of system variable test programs for bug#35988.
mysql-test/t/disabled.def@stripped, 2008-04-11 21:59:29+02:00, hhunger@stripped +3 -0
Fixes of system variable test programs for bug#35988.
mysql-test/t/general_log_file_func.test@stripped, 2008-04-11 21:59:29+02:00, hhunger@stripped +2 -1
Fixes of system variable test programs for bug#35988.
mysql-test/t/general_log_func.test@stripped, 2008-04-11 21:59:29+02:00, hhunger@stripped +4 -2
Fixes of system variable test programs for bug#35988.
mysql-test/t/local_infile_func.test@stripped, 2008-04-11 21:59:29+02:00, hhunger@stripped +2 -2
Fixes of system variable test programs for bug#35988.
mysql-test/t/max_allowed_packet_func.test@stripped, 2008-04-11 21:59:30+02:00, hhunger@stripped +1 -1
Fixes of system variable test programs for bug#35988.
mysql-test/t/max_user_connections_func.test@stripped, 2008-04-11 21:59:30+02:00, hhunger@stripped +2 -0
Fixes of system variable test programs for bug#35988.
mysql-test/t/old_passwords_func.test@stripped, 2008-04-11 21:59:30+02:00, hhunger@stripped +2 -0
Fixes of system variable test programs for bug#35988.
mysql-test/t/read_only_func.test@stripped, 2008-04-11 21:59:30+02:00, hhunger@stripped +2 -0
Fixes of system variable test programs for bug#35988.
mysql-test/t/relay_log_purge_basic.test@stripped, 2008-04-11 21:59:30+02:00, hhunger@stripped +1 -0
Fixes of system variable test programs for bug#35988.
mysql-test/t/secure_auth_func.test@stripped, 2008-04-11 21:59:30+02:00, hhunger@stripped +2 -0
Fixes of system variable test programs for bug#35988.
mysql-test/t/slave_compressed_protocol_basic.test@stripped, 2008-04-11 21:59:30+02:00, hhunger@stripped +1 -0
Fixes of system variable test programs for bug#35988.
mysql-test/t/slave_net_timeout_basic.test@stripped, 2008-04-11 21:59:30+02:00, hhunger@stripped +1 -0
Fixes of system variable test programs for bug#35988.
mysql-test/t/slow_launch_time_func.test@stripped, 2008-04-11 21:59:30+02:00, hhunger@stripped +2 -0
Fixes of system variable test programs for bug#35988.
mysql-test/t/slow_query_log_file_func.test@stripped, 2008-04-11 21:59:30+02:00, hhunger@stripped +2 -1
Fixes of system variable test programs for bug#35988.
mysql-test/t/sql_slave_skip_counter_basic.test@stripped, 2008-04-11 21:59:30+02:00, hhunger@stripped +1 -0
Fixes of system variable test programs for bug#35988.
mysql-test/t/ssl_ca_basic.test@stripped, 2008-04-11 21:59:30+02:00, hhunger@stripped +2 -0
Fixes of system variable test programs for bug#35988.
mysql-test/t/ssl_cert_basic.test@stripped, 2008-04-11 21:59:31+02:00, hhunger@stripped +2 -0
Fixes of system variable test programs for bug#35988.
mysql-test/t/ssl_key_basic.test@stripped, 2008-04-11 21:59:31+02:00, hhunger@stripped +2 -0
Fixes of system variable test programs for bug#35988.
mysql-test/t/thread_cache_size_func.test@stripped, 2008-04-11 21:59:31+02:00, hhunger@stripped +2 -0
Fixes of system variable test programs for bug#35988.
mysql-test/t/wait_timeout_func.test@stripped, 2008-04-11 21:59:31+02:00, hhunger@stripped +2 -0
Fixes of system variable test programs for bug#35988.
diff -Nrup a/mysql-test/r/local_infile_func.result b/mysql-test/r/local_infile_func.result
--- a/mysql-test/r/local_infile_func.result 2008-04-10 15:13:34 +02:00
+++ b/mysql-test/r/local_infile_func.result 2008-04-11 21:59:28 +02:00
@@ -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(*)
diff -Nrup a/mysql-test/r/max_allowed_packet_func.result b/mysql-test/r/max_allowed_packet_func.result
--- a/mysql-test/r/max_allowed_packet_func.result 2008-04-10 15:13:35 +02:00
+++ b/mysql-test/r/max_allowed_packet_func.result 2008-04-11 21:59:29 +02:00
@@ -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;;;;;;;;;;;;;;;;;;;;;;;;;;;dsklfjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjkljffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdkskkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk");
-ERROR 08S01: Got a packet bigger than 'max_allowed_packet' bytes
## Server disconnects after this case and error occurs that Server ##
## has gone away ##
diff -Nrup a/mysql-test/t/automatic_sp_privileges_func.test b/mysql-test/t/automatic_sp_privileges_func.test
--- a/mysql-test/t/automatic_sp_privileges_func.test 2008-04-10 15:13:47 +02:00
+++ b/mysql-test/t/automatic_sp_privileges_func.test 2008-04-11 21:59:29 +02:00
@@ -24,6 +24,8 @@
# Setup
#
+--source include/not_embedded.inc
+
--echo ** Setup **
SET @global_automatic_sp_privileges = @@GLOBAL.automatic_sp_privileges;
diff -Nrup a/mysql-test/t/completion_type_func.test b/mysql-test/t/completion_type_func.test
--- a/mysql-test/t/completion_type_func.test 2008-04-10 15:13:49 +02:00
+++ b/mysql-test/t/completion_type_func.test 2008-04-11 21:59:29 +02:00
@@ -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 ##
diff -Nrup a/mysql-test/t/delayed_insert_limit_func.test b/mysql-test/t/delayed_insert_limit_func.test
--- a/mysql-test/t/delayed_insert_limit_func.test 2008-04-10 15:13:50 +02:00
+++ b/mysql-test/t/delayed_insert_limit_func.test 2008-04-11 21:59:29 +02:00
@@ -25,6 +25,8 @@
# Setup
#
+--source include/not_embedded.inc
+
--echo Creating connection con0
connect (con0,localhost,root,,);
--echo Creating connection con1
diff -Nrup a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
--- a/mysql-test/t/disabled.def 2008-03-17 16:11:23 +01:00
+++ b/mysql-test/t/disabled.def 2008-04-11 21:59:29 +02:00
@@ -21,3 +21,6 @@ ctype_create : Bug#32965 main.ct
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.
+
diff -Nrup a/mysql-test/t/general_log_file_func.test b/mysql-test/t/general_log_file_func.test
--- a/mysql-test/t/general_log_file_func.test 2008-04-10 15:13:52 +02:00
+++ b/mysql-test/t/general_log_file_func.test 2008-04-11 21:59:29 +02:00
@@ -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;
diff -Nrup a/mysql-test/t/general_log_func.test b/mysql-test/t/general_log_func.test
--- a/mysql-test/t/general_log_func.test 2008-04-10 15:13:52 +02:00
+++ b/mysql-test/t/general_log_func.test 2008-04-11 21:59:29 +02:00
@@ -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');
diff -Nrup a/mysql-test/t/local_infile_func.test b/mysql-test/t/local_infile_func.test
--- a/mysql-test/t/local_infile_func.test 2008-04-10 15:13:59 +02:00
+++ b/mysql-test/t/local_infile_func.test 2008-04-11 21:59:29 +02:00
@@ -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;
diff -Nrup a/mysql-test/t/max_allowed_packet_func.test b/mysql-test/t/max_allowed_packet_func.test
--- a/mysql-test/t/max_allowed_packet_func.test 2008-04-10 15:14:00 +02:00
+++ b/mysql-test/t/max_allowed_packet_func.test 2008-04-11 21:59:30 +02:00
@@ -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;;;;;;;;;;;;;;;;;;;;;;;;;;;dsklfjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjkljffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdkskkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk");
--echo ## Server disconnects after this case and error occurs that Server ##
diff -Nrup a/mysql-test/t/max_user_connections_func.test b/mysql-test/t/max_user_connections_func.test
--- a/mysql-test/t/max_user_connections_func.test 2008-04-10 15:14:02 +02:00
+++ b/mysql-test/t/max_user_connections_func.test 2008-04-11 21:59:30 +02:00
@@ -26,6 +26,8 @@
# Setup
#
+--source include/not_embedded.inc
+
SET @default_max_user_connections = @@max_user_connections;
diff -Nrup a/mysql-test/t/old_passwords_func.test b/mysql-test/t/old_passwords_func.test
--- a/mysql-test/t/old_passwords_func.test 2008-04-10 15:14:03 +02:00
+++ b/mysql-test/t/old_passwords_func.test 2008-04-11 21:59:30 +02:00
@@ -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;
diff -Nrup a/mysql-test/t/read_only_func.test b/mysql-test/t/read_only_func.test
--- a/mysql-test/t/read_only_func.test 2008-04-10 15:14:04 +02:00
+++ b/mysql-test/t/read_only_func.test 2008-04-11 21:59:30 +02:00
@@ -26,6 +26,8 @@
# Setup
#
+--source include/not_embedded.inc
+
SET @default_read_only = @@read_only;
--echo '#--------------------FN_DYNVARS_140_01-------------------------#'
diff -Nrup a/mysql-test/t/relay_log_purge_basic.test b/mysql-test/t/relay_log_purge_basic.test
--- a/mysql-test/t/relay_log_purge_basic.test 2008-04-10 15:14:04 +02:00
+++ b/mysql-test/t/relay_log_purge_basic.test 2008-04-11 21:59:30 +02:00
@@ -23,6 +23,7 @@
# #
###############################################################################
+--source include/not_embedded.inc
--source include/load_sysvars.inc
#####################################################################
diff -Nrup a/mysql-test/t/secure_auth_func.test b/mysql-test/t/secure_auth_func.test
--- a/mysql-test/t/secure_auth_func.test 2008-04-10 15:14:05 +02:00
+++ b/mysql-test/t/secure_auth_func.test 2008-04-11 21:59:30 +02:00
@@ -29,6 +29,8 @@
# Setup
#
+--source include/not_embedded.inc
+
#
# Save initial value
#
diff -Nrup a/mysql-test/t/slave_compressed_protocol_basic.test b/mysql-test/t/slave_compressed_protocol_basic.test
--- a/mysql-test/t/slave_compressed_protocol_basic.test 2008-04-10 15:14:05 +02:00
+++ b/mysql-test/t/slave_compressed_protocol_basic.test 2008-04-11 21:59:30 +02:00
@@ -23,6 +23,7 @@
# #
###############################################################################
+--source include/not_embedded.inc
--source include/load_sysvars.inc
########################################################################
# START OF slave_compressed_protocol TESTS #
diff -Nrup a/mysql-test/t/slave_net_timeout_basic.test b/mysql-test/t/slave_net_timeout_basic.test
--- a/mysql-test/t/slave_net_timeout_basic.test 2008-04-10 15:14:05 +02:00
+++ b/mysql-test/t/slave_net_timeout_basic.test 2008-04-11 21:59:30 +02:00
@@ -23,6 +23,7 @@
# #
###############################################################################
+--source include/not_embedded.inc
--source include/load_sysvars.inc
###########################################################
# START OF slave_net_timeout TESTS #
diff -Nrup a/mysql-test/t/slow_launch_time_func.test b/mysql-test/t/slow_launch_time_func.test
--- a/mysql-test/t/slow_launch_time_func.test 2008-04-10 15:14:05 +02:00
+++ b/mysql-test/t/slow_launch_time_func.test 2008-04-11 21:59:30 +02:00
@@ -24,6 +24,8 @@
# Setup
#
+--source include/not_embedded.inc
+
SET @global_slow_launch_time = @@GLOBAL.slow_launch_time;
diff -Nrup a/mysql-test/t/slow_query_log_file_func.test b/mysql-test/t/slow_query_log_file_func.test
--- a/mysql-test/t/slow_query_log_file_func.test 2008-04-10 15:14:07 +02:00
+++ b/mysql-test/t/slow_query_log_file_func.test 2008-04-11 21:59:30 +02:00
@@ -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 ##
diff -Nrup a/mysql-test/t/sql_slave_skip_counter_basic.test b/mysql-test/t/sql_slave_skip_counter_basic.test
--- a/mysql-test/t/sql_slave_skip_counter_basic.test 2008-04-10 15:14:09 +02:00
+++ b/mysql-test/t/sql_slave_skip_counter_basic.test 2008-04-11 21:59:30 +02:00
@@ -23,6 +23,7 @@
# #
###############################################################################
+--source include/not_embedded.inc
--source include/load_sysvars.inc
################################################################
diff -Nrup a/mysql-test/t/ssl_ca_basic.test b/mysql-test/t/ssl_ca_basic.test
--- a/mysql-test/t/ssl_ca_basic.test 2008-04-10 15:14:09 +02:00
+++ b/mysql-test/t/ssl_ca_basic.test 2008-04-11 21:59:30 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_ssl.inc
+
--echo '#---------------------BS_STVARS_045_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/ssl_cert_basic.test b/mysql-test/t/ssl_cert_basic.test
--- a/mysql-test/t/ssl_cert_basic.test 2008-04-10 15:14:09 +02:00
+++ b/mysql-test/t/ssl_cert_basic.test 2008-04-11 21:59:31 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_ssl.inc
+
--echo '#---------------------BS_STVARS_047_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/ssl_key_basic.test b/mysql-test/t/ssl_key_basic.test
--- a/mysql-test/t/ssl_key_basic.test 2008-04-10 15:14:10 +02:00
+++ b/mysql-test/t/ssl_key_basic.test 2008-04-11 21:59:31 +02:00
@@ -22,6 +22,8 @@
# #
###############################################################################
+--source include/have_ssl.inc
+
--echo '#---------------------BS_STVARS_049_01----------------------#'
####################################################################
# Displaying default value #
diff -Nrup a/mysql-test/t/thread_cache_size_func.test b/mysql-test/t/thread_cache_size_func.test
--- a/mysql-test/t/thread_cache_size_func.test 2008-04-10 15:14:10 +02:00
+++ b/mysql-test/t/thread_cache_size_func.test 2008-04-11 21:59:31 +02:00
@@ -26,6 +26,8 @@
# Setup
#
+--source include/not_embedded.inc
+
SET @global_thread_cache_size = @@GLOBAL.thread_cache_size;
FLUSH STATUS;
diff -Nrup a/mysql-test/t/wait_timeout_func.test b/mysql-test/t/wait_timeout_func.test
--- a/mysql-test/t/wait_timeout_func.test 2008-04-10 15:14:12 +02:00
+++ b/mysql-test/t/wait_timeout_func.test 2008-04-11 21:59:31 +02:00
@@ -19,6 +19,8 @@
# #
###############################################################################
+--source include/not_embedded.inc
+
--disable_warnings
drop table if exists t1;
--enable_warnings
| Thread |
|---|
| • bk commit into 5.1 tree (hhunger:1.2590) BUG#35988 | horst | 11 Apr |
