From e195149b43db9b6bd06419d5e1709c44bc20343f Mon Sep 17 00:00:00 2001 From: Patrick Crews Date: Fri, 25 Jul 2008 13:14:52 -0400 Subject: [PATCH] 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 --- mysql-test/suite/funcs_1/triggers/triggers_03.inc | 5 ----- mysql-test/suite/funcs_1/triggers/triggers_08.inc | 3 +-- mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc | 7 ------- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/mysql-test/suite/funcs_1/triggers/triggers_03.inc b/mysql-test/suite/funcs_1/triggers/triggers_03.inc index f8a83315f0c..9ef6a9ac9af 100644 --- a/mysql-test/suite/funcs_1/triggers/triggers_03.inc +++ b/mysql-test/suite/funcs_1/triggers/triggers_03.inc @@ -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 diff --git a/mysql-test/suite/funcs_1/triggers/triggers_08.inc b/mysql-test/suite/funcs_1/triggers/triggers_08.inc index 399b27508db..087f18e8e6b 100644 --- a/mysql-test/suite/funcs_1/triggers/triggers_08.inc +++ b/mysql-test/suite/funcs_1/triggers/triggers_08.inc @@ -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:; diff --git a/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc b/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc index 529eb6c77fd..7230f240e2d 100644 --- a/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc +++ b/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc @@ -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 -eval -load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb3.txt' -into table tb3; --disable_abort_on_error