MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Patrick Crews Date:July 25 2008 5:32pm
Subject:bzr push into mysql-5.1 branch (pcrews:2678 to 2679) Bug#38383
View as plain text  
 2679 Patrick Crews	2008-07-25
      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
modified:
  mysql-test/suite/funcs_1/triggers/triggers_03.inc
  mysql-test/suite/funcs_1/triggers/triggers_08.inc
  mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc

 2678 Georgi Kodinov	2008-07-25 [merge]
      merge of 5.1-main to 5.1-bugteam
modified:
  configure.in
  mysql-test/suite/ndb/t/disabled.def
  mysql-test/suite/rpl_ndb/t/disabled.def

=== modified file 'mysql-test/suite/funcs_1/triggers/triggers_03.inc'
--- a/mysql-test/suite/funcs_1/triggers/triggers_03.inc	2008-07-19 08:31:33 +0000
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03.inc	2008-07-25 17:14:52 +0000
@@ -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
 

=== modified file 'mysql-test/suite/funcs_1/triggers/triggers_08.inc'
--- a/mysql-test/suite/funcs_1/triggers/triggers_08.inc	2008-07-19 08:31:33 +0000
+++ b/mysql-test/suite/funcs_1/triggers/triggers_08.inc	2008-07-25 17:14:52 +0000
@@ -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:;

=== modified file 'mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc'
--- a/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc	2008-07-19 08:31:33 +0000
+++ b/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc	2008-07-25 17:14:52 +0000
@@ -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
 

Thread
bzr push into mysql-5.1 branch (pcrews:2678 to 2679) Bug#38383Patrick Crews25 Jul