Commit e195149b authored by Patrick Crews's avatar Patrick Crews

Bug#38383 - Certain funcs_1 trig tests are failing on Pushbuild.

Removing duplicate 'setup' portions of these include files.  Likely an editor error created dupe lines.
This is causing many Pushbuild errors
parent c7fc78c3
...@@ -13,12 +13,7 @@ ...@@ -13,12 +13,7 @@
USE test; USE test;
--source suite/funcs_1/include/tb3.inc --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 --disable_abort_on_error
......
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
USE test; USE test;
--source suite/funcs_1/include/tb3.inc --source suite/funcs_1/include/tb3.inc
USE test;
--source suite/funcs_1/include/tb3.inc
# General setup for Trigger tests # General setup for Trigger tests
let $message= Testcase: 3.5:; let $message= Testcase: 3.5:;
......
...@@ -13,13 +13,6 @@ eval ...@@ -13,13 +13,6 @@ eval
load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb3.txt' load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb3.txt'
into table tb3; 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 --disable_abort_on_error
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment