diff options
| -rw-r--r-- | mysql-test/suite/funcs_1/triggers/triggers_03.inc | 7 | ||||
| -rw-r--r-- | mysql-test/suite/funcs_1/triggers/triggers_08.inc | 3 | ||||
| -rw-r--r-- | mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc | 8 | ||||
| -rw-r--r-- | support-files/my-huge.cnf.sh | 3 | ||||
| -rw-r--r-- | support-files/my-large.cnf.sh | 3 | ||||
| -rw-r--r-- | support-files/my-medium.cnf.sh | 3 |
6 files changed, 27 insertions, 0 deletions
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_03.inc b/mysql-test/suite/funcs_1/triggers/triggers_03.inc index b07a30d834f..f8a83315f0c 100644 --- a/mysql-test/suite/funcs_1/triggers/triggers_03.inc +++ b/mysql-test/suite/funcs_1/triggers/triggers_03.inc @@ -13,6 +13,13 @@ USE test; --source suite/funcs_1/include/tb3.inc +# This test cannot be used for the embedded server because we check here +# privilgeges. +--source include/not_embedded.inc + +USE test; +--source suite/funcs_1/include/tb3.inc + --disable_abort_on_error ########################################### diff --git a/mysql-test/suite/funcs_1/triggers/triggers_08.inc b/mysql-test/suite/funcs_1/triggers/triggers_08.inc index a722f8c9019..399b27508db 100644 --- a/mysql-test/suite/funcs_1/triggers/triggers_08.inc +++ b/mysql-test/suite/funcs_1/triggers/triggers_08.inc @@ -8,6 +8,9 @@ USE test; --source suite/funcs_1/include/tb3.inc +USE test; +--source suite/funcs_1/include/tb3.inc + # General setup for Trigger tests let $message= Testcase: 3.5:; --source include/show_msg.inc diff --git a/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc b/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc index 1681c693cba..529eb6c77fd 100644 --- a/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc +++ b/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc @@ -13,6 +13,14 @@ eval load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb3.txt' into table tb3; +USE test; +--source suite/funcs_1/include/tb3.inc + +--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR> +eval +load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb3.txt' +into table tb3; + --disable_abort_on_error ############################################## diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh index 31221ece0ee..f670adb460c 100644 --- a/support-files/my-huge.cnf.sh +++ b/support-files/my-huge.cnf.sh @@ -46,6 +46,9 @@ thread_concurrency = 8 # #skip-networking +# Disable Federated by default +skip-federated + # Replication Master Server (default) # binary logging is required for replication log-bin=mysql-bin diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh index 6fa4c21f96b..2e3143ac449 100644 --- a/support-files/my-large.cnf.sh +++ b/support-files/my-large.cnf.sh @@ -46,6 +46,9 @@ thread_concurrency = 8 # #skip-networking +# Disable Federated by default +skip-federated + # Replication Master Server (default) # binary logging is required for replication log-bin=mysql-bin diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh index 4a7bfcfc775..10d3e74f619 100644 --- a/support-files/my-medium.cnf.sh +++ b/support-files/my-medium.cnf.sh @@ -44,6 +44,9 @@ myisam_sort_buffer_size = 8M # #skip-networking +# Disable Federated by default +skip-federated + # Replication Master Server (default) # binary logging is required for replication log-bin=mysql-bin |