Commit 44be2454 authored by Patrick Crews's avatar Patrick Crews
Browse files

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 f6d66bd6

mysql-test/suite/funcs_1/triggers/triggers_03.inc

+0 −5
Original line number Diff line number Diff line
@@ -13,12 +13,7 @@ 
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

mysql-test/suite/funcs_1/triggers/triggers_08.inc

+1 −2
Original line number Diff line number Diff line
@@ -8,8 +8,7 @@ 
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:;

mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc

+0 −7
Original line number Diff line number Diff line
@@ -13,13 +13,6 @@ 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