List:Commits« Previous MessageNext Message »
From:mleich Date:March 12 2008 11:56am
Subject:bk commit into 5.1 tree (mleich:1.2566) BUG#34532
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of mleich.  When mleich does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-12 12:56:07+01:00, mleich@stripped +31 -0
  Post merge fix for
     ChangeSet@stripped, 2008-03-11 20:20:49+01:00
       Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
       into  five.local.lan:/work/merge/mysql-5.1-funcs_1
       MERGE: 1.1810.3473.26
  
     ChangeSet@stripped, 2008-03-11 19:54:35+01:00
     Post fix for
     WL#4203 Reorganize and fix the data dictionary tests of
             testsuite funcs_1
  
  The final fix of
  Bug#34532 Some funcs_1 tests do not clean up at end of testing
     and some minor additional modifications are for
  happens here

  mysql-test/suite/funcs_1/r/innodb_trig_03e.result@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_innodb.result@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_memory.result@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/is_columns_myisam.result@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/is_tables_ndb.result@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/memory_trig_03e.result@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/myisam_trig_03e.result@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/ndb_bitdata.result@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +0 -64
    Updated results

  mysql-test/suite/funcs_1/r/ndb_cursors.result@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +0 -79
    Updated results

  mysql-test/suite/funcs_1/r/ndb_trig_0102.result@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/ndb_trig_03.result@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/ndb_trig_03e.result@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +0 -1
    Updated results

  mysql-test/suite/funcs_1/r/ndb_trig_0407.result@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/ndb_trig_08.result@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/ndb_trig_09.result@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +1 -1
    Updated results

  mysql-test/suite/funcs_1/r/ndb_views.result@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +2 -2
    Updated results

  mysql-test/suite/funcs_1/t/innodb_trig_03e.test@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +2 -19
    Cleanup

  mysql-test/suite/funcs_1/t/memory_trig_03e.test@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +2 -20
    Cleanup

  mysql-test/suite/funcs_1/t/myisam_trig_03e.test@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +2 -21
    Cleanup

  mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +0 -9
    Cleanup

  mysql-test/suite/funcs_1/t/ndb_bitdata.test@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +6 -18
    Cleanup

  mysql-test/suite/funcs_1/t/ndb_cursors.test@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +6 -17
    Cleanup

  mysql-test/suite/funcs_1/t/ndb_trig_0102.test@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +4 -18
    Cleanup

  mysql-test/suite/funcs_1/t/ndb_trig_03.test@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +4 -18
    Cleanup

  mysql-test/suite/funcs_1/t/ndb_trig_03e.test@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +2 -20
    Cleanup

  mysql-test/suite/funcs_1/t/ndb_trig_0407.test@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +4 -18
    Cleanup

  mysql-test/suite/funcs_1/t/ndb_trig_08.test@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +4 -18
    Cleanup

  mysql-test/suite/funcs_1/t/ndb_trig_09.test@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +4 -18
    Cleanup

  mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +4 -18
    Cleanup

  mysql-test/suite/funcs_1/t/ndb_views.test@stripped, 2008-03-12 12:56:05+01:00, mleich@stripped +12 -32
    Cleanup

diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_trig_03e.result b/mysql-test/suite/funcs_1/r/innodb_trig_03e.result
--- a/mysql-test/suite/funcs_1/r/innodb_trig_03e.result	2007-10-26 17:36:20 +02:00
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_03e.result	2008-03-12 12:56:05 +01:00
@@ -1,4 +1,3 @@
-SET @NO_REFRESH = IF( '' = '', 0, 1);
 USE test;
 
 Testcase for db level:
diff -Nrup a/mysql-test/suite/funcs_1/r/is_columns_innodb.result b/mysql-test/suite/funcs_1/r/is_columns_innodb.result
--- a/mysql-test/suite/funcs_1/r/is_columns_innodb.result	2008-03-11 20:20:47 +01:00
+++ b/mysql-test/suite/funcs_1/r/is_columns_innodb.result	2008-03-12 12:56:05 +01:00
@@ -1,4 +1,3 @@
-SET @NO_REFRESH = IF( '' = '', 0, 1);
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1;
 USE test;
diff -Nrup a/mysql-test/suite/funcs_1/r/is_columns_memory.result b/mysql-test/suite/funcs_1/r/is_columns_memory.result
--- a/mysql-test/suite/funcs_1/r/is_columns_memory.result	2008-03-11 20:15:21 +01:00
+++ b/mysql-test/suite/funcs_1/r/is_columns_memory.result	2008-03-12 12:56:05 +01:00
@@ -1,5 +1,4 @@
 SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
-SET @NO_REFRESH = IF( '' = '', 0, 1);
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1;
 USE test;
diff -Nrup a/mysql-test/suite/funcs_1/r/is_columns_myisam.result b/mysql-test/suite/funcs_1/r/is_columns_myisam.result
--- a/mysql-test/suite/funcs_1/r/is_columns_myisam.result	2008-03-11 20:15:41 +01:00
+++ b/mysql-test/suite/funcs_1/r/is_columns_myisam.result	2008-03-12 12:56:05 +01:00
@@ -1,5 +1,4 @@
 SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
-SET @NO_REFRESH = IF( '' = '', 0, 1);
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1;
 USE test;
diff -Nrup a/mysql-test/suite/funcs_1/r/is_tables_ndb.result b/mysql-test/suite/funcs_1/r/is_tables_ndb.result
--- a/mysql-test/suite/funcs_1/r/is_tables_ndb.result	2008-03-11 20:16:27 +01:00
+++ b/mysql-test/suite/funcs_1/r/is_tables_ndb.result	2008-03-12 12:56:05 +01:00
@@ -1,4 +1,3 @@
-SET @NO_REFRESH = IF( '' = '', 0, 1);
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1;
 USE test;
diff -Nrup a/mysql-test/suite/funcs_1/r/memory_trig_03e.result b/mysql-test/suite/funcs_1/r/memory_trig_03e.result
--- a/mysql-test/suite/funcs_1/r/memory_trig_03e.result	2007-10-26 17:36:20 +02:00
+++ b/mysql-test/suite/funcs_1/r/memory_trig_03e.result	2008-03-12 12:56:05 +01:00
@@ -1,4 +1,3 @@
-SET @NO_REFRESH = IF( '' = '', 0, 1);
 USE test;
 
 Testcase for db level:
diff -Nrup a/mysql-test/suite/funcs_1/r/myisam_trig_03e.result b/mysql-test/suite/funcs_1/r/myisam_trig_03e.result
--- a/mysql-test/suite/funcs_1/r/myisam_trig_03e.result	2007-10-26 17:36:20 +02:00
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_03e.result	2008-03-12 12:56:05 +01:00
@@ -1,4 +1,3 @@
-SET @NO_REFRESH = IF( '' = '', 0, 1);
 USE test;
 
 Testcase for db level:
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_bitdata.result b/mysql-test/suite/funcs_1/r/ndb_bitdata.result
--- a/mysql-test/suite/funcs_1/r/ndb_bitdata.result	2007-02-06 13:19:32 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_bitdata.result	2008-03-12 12:56:05 +01:00
@@ -1,67 +1,3 @@
-SET @NO_REFRESH = IF( '' = '', 0, 1);
-USE test;
-drop table if exists tb4;
-create table tb4 (
-f176 numeric (0) unsigned not null DEFAULT 9, 
-f177 numeric (64) unsigned not null DEFAULT 9, 
-f178 numeric (0) zerofill not null DEFAULT 9, 
-f179 numeric (64) zerofill not null DEFAULT 9, 
-f180 numeric (0) unsigned zerofill not null DEFAULT 9, 
-f181 numeric (64) unsigned zerofill not null DEFAULT 9, 
-f182 numeric (0,0) not null DEFAULT 9, 
-f183 numeric (63,30) not null DEFAULT 9, 
-f184 numeric (0,0) unsigned not null DEFAULT 9, 
-f185 numeric (63,30) unsigned not null DEFAULT 9, 
-f186 numeric (0,0) zerofill not null DEFAULT 9, 
-f187 numeric (63,30) zerofill not null DEFAULT 9, 
-f188 numeric (0,0) unsigned zerofill not null DEFAULT 9, 
-f189 numeric (63,30) unsigned zerofill not null DEFAULT 9, 
-f190 real not null DEFAULT 88.8, 
-f191 real unsigned not null DEFAULT 88.8, 
-f192 real zerofill not null DEFAULT 88.8, 
-f193 real unsigned zerofill not null DEFAULT 88.8, 
-f194 double not null DEFAULT 55.5, 
-f195 double unsigned not null DEFAULT 55.5, 
-f196 double zerofill not null DEFAULT 55.5, 
-f197 double unsigned zerofill not null DEFAULT 55.5, 
-f198 float, 
-f199 float unsigned, 
-f200 float zerofill, 
-f201 float unsigned zerofill, 
-f202 float(0), 
-f203 float(23), 
-f204 float(0) unsigned, 
-f205 float(23) unsigned, 
-f206 float(0) zerofill, 
-f207 float(23) zerofill, 
-f208 float(0) unsigned zerofill, 
-f209 float(23) unsigned zerofill, 
-f210 float(24), 
-f211 float(53), 
-f212 float(24) unsigned, 
-f213 float(53) unsigned, 
-f214 float(24) zerofill, 
-f215 float(53) zerofill, 
-f216 float(24) unsigned zerofill, 
-f217 float(53) unsigned zerofill, 
-f218 date, 
-f219 time, 
-f220 datetime, 
-f221 timestamp, 
-f222 year, 
-f223 year(3), 
-f224 year(4), 
-f225 enum("1enum","2enum"), 
-f226 set("1set","2set"),
-f235 char(0) unicode,
-f236 char(90),
-f237 char(255) ascii,
-f238 varchar(0),
-f239 varchar(3000) binary,
-f240 varchar(2000) unicode,
-f241 char(100) unicode
-) engine = ndb;
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb4.txt' into table tb4 ;
 
 NOT YET IMPLEMENTED: bitdata tests
 --------------------------------------------------------------------------------
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_cursors.result b/mysql-test/suite/funcs_1/r/ndb_cursors.result
--- a/mysql-test/suite/funcs_1/r/ndb_cursors.result	2007-11-19 21:24:31 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_cursors.result	2008-03-12 12:56:05 +01:00
@@ -1,82 +1,3 @@
-SET @NO_REFRESH = IF( '' = '', 0, 1);
-USE test;
-drop table if exists tb1 ;
-create table tb1 (
-f1 char(0), 
-f2 char(0) binary, 
-f3 char(0) ascii, 
-f4 tinytext unicode, 
-f5 text, 
-f6 mediumtext, 
-f7 longtext, 
-f8 tinyblob, 
-f9 blob,
-f10 mediumblob, 
-f11 longblob, 
-f12 binary, 
-f13 tinyint, 
-f14 tinyint unsigned, 
-f15 tinyint zerofill, 
-f16 tinyint unsigned zerofill, 
-f17 smallint, 
-f18 smallint unsigned,  
-f19 smallint zerofill, 
-f20 smallint unsigned zerofill, 
-f21 mediumint, 
-f22 mediumint unsigned, 
-f23 mediumint zerofill, 
-f24 mediumint unsigned zerofill, 
-f25 int, 
-f26 int unsigned, 
-f27 int zerofill, 
-f28 int unsigned zerofill, 
-f29 bigint, 
-f30 bigint unsigned, 
-f31 bigint zerofill, 
-f32 bigint unsigned zerofill, 
-f33 decimal, 
-f34 decimal unsigned, 
-f35 decimal zerofill, 
-f36 decimal unsigned zerofill not null DEFAULT 9.9, 
-f37 decimal (0) not null DEFAULT 9.9, 
-f38 decimal (64) not null DEFAULT 9.9, 
-f39 decimal (0) unsigned not null DEFAULT 9.9, 
-f40 decimal (64) unsigned not null DEFAULT 9.9, 
-f41 decimal (0) zerofill not null DEFAULT 9.9, 
-f42 decimal (64) zerofill not null DEFAULT 9.9, 
-f43 decimal (0) unsigned zerofill not null DEFAULT 9.9, 
-f44 decimal (64) unsigned zerofill not null DEFAULT 9.9, 
-f45 decimal (0,0) not null DEFAULT 9.9, 
-f46 decimal (63,30) not null DEFAULT 9.9, 
-f47 decimal (0,0) unsigned not null DEFAULT 9.9, 
-f48 decimal (63,30) unsigned not null DEFAULT 9.9, 
-f49 decimal (0,0) zerofill not null DEFAULT 9.9, 
-f50 decimal (63,30) zerofill not null DEFAULT 9.9, 
-f51 decimal (0,0) unsigned zerofill not null DEFAULT 9.9, 
-f52 decimal (63,30) unsigned zerofill not null DEFAULT 9.9, 
-f53 numeric not null DEFAULT 99, 
-f54 numeric unsigned not null DEFAULT 99, 
-f55 numeric zerofill not null DEFAULT 99, 
-f56 numeric unsigned zerofill not null DEFAULT 99, 
-f57 numeric (0) not null DEFAULT 99, 
-f58 numeric (64) not null DEFAULT 99
-) engine = ndb;
-Warnings:
-Note	1265	Data truncated for column 'f36' at row 1
-Note	1265	Data truncated for column 'f37' at row 1
-Note	1265	Data truncated for column 'f38' at row 1
-Note	1265	Data truncated for column 'f39' at row 1
-Note	1265	Data truncated for column 'f40' at row 1
-Note	1265	Data truncated for column 'f41' at row 1
-Note	1265	Data truncated for column 'f42' at row 1
-Note	1265	Data truncated for column 'f43' at row 1
-Note	1265	Data truncated for column 'f44' at row 1
-Note	1265	Data truncated for column 'f45' at row 1
-Note	1265	Data truncated for column 'f47' at row 1
-Note	1265	Data truncated for column 'f49' at row 1
-Note	1265	Data truncated for column 'f51' at row 1
-Error	1478	Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
-load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb1.txt' into table tb1 ;
 
 NOT YET IMPLEMENTED: cursor tests
 --------------------------------------------------------------------------------
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_trig_0102.result b/mysql-test/suite/funcs_1/r/ndb_trig_0102.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_0102.result	2007-11-19 21:24:31 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_0102.result	2008-03-12 12:56:05 +01:00
@@ -1,4 +1,3 @@
-SET @NO_REFRESH = IF( '' = '', 0, 1);
 USE test;
 drop table if exists tb3 ;
 create table tb3 (
@@ -368,3 +367,4 @@ select @test_var1, @test_var2, @test_var
 trig1_b	trig1_a	trig2
 drop database trig_db1;
 drop database trig_db2;
+DROP TABLE test.tb3;
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_trig_03.result b/mysql-test/suite/funcs_1/r/ndb_trig_03.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_03.result	2008-01-08 13:55:51 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_03.result	2008-03-12 12:56:05 +01:00
@@ -1,4 +1,3 @@
-SET @NO_REFRESH = IF( '' = '', 0, 1);
 USE test;
 drop table if exists tb3 ;
 create table tb3 (
@@ -699,3 +698,4 @@ drop database if exists priv_db;
 drop user test_yesprivs@localhost;
 drop user test_noprivs@localhost;
 drop user test_noprivs;
+DROP TABLE test.tb3;
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_trig_03e.result b/mysql-test/suite/funcs_1/r/ndb_trig_03e.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_03e.result	2007-10-26 17:36:20 +02:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_03e.result	2008-03-12 12:56:05 +01:00
@@ -1,4 +1,3 @@
-SET @NO_REFRESH = IF( '' = '', 0, 1);
 USE test;
 
 Testcase for db level:
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_trig_0407.result b/mysql-test/suite/funcs_1/r/ndb_trig_0407.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_0407.result	2007-11-19 21:24:31 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_0407.result	2008-03-12 12:56:05 +01:00
@@ -1,4 +1,3 @@
-SET @NO_REFRESH = IF( '' = '', 0, 1);
 USE test;
 drop table if exists tb3 ;
 create table tb3 (
@@ -479,3 +478,4 @@ Testcase 3.5.7.17 (see Testcase 3.5.1.1)
 drop user test_general@localhost;
 drop user test_general;
 drop user test_super@localhost;
+DROP TABLE test.tb3;
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_trig_08.result b/mysql-test/suite/funcs_1/r/ndb_trig_08.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_08.result	2008-01-08 13:55:51 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_08.result	2008-03-12 12:56:05 +01:00
@@ -1,4 +1,3 @@
-SET @NO_REFRESH = IF( '' = '', 0, 1);
 USE test;
 drop table if exists tb3 ;
 create table tb3 (
@@ -535,3 +534,4 @@ ERROR HY000: Explicit or implicit commit
 drop user test_general@localhost;
 drop user test_general;
 drop user test_super@localhost;
+DROP TABLE test.tb3;
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_trig_09.result b/mysql-test/suite/funcs_1/r/ndb_trig_09.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_09.result	2008-01-31 16:12:51 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_09.result	2008-03-12 12:56:05 +01:00
@@ -1,4 +1,3 @@
-SET @NO_REFRESH = IF( '' = '', 0, 1);
 USE test;
 drop table if exists tb3 ;
 create table tb3 (
@@ -271,3 +270,4 @@ drop trigger trg6c;
 
 Testcase 3.5.9.14: (implied in previous tests)
 ----------------------------------------------
+DROP TABLE test.tb3;
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result b/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result	2008-01-08 13:55:51 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result	2008-03-12 12:56:05 +01:00
@@ -1,4 +1,3 @@
-SET @NO_REFRESH = IF( '' = '', 0, 1);
 USE test;
 drop table if exists tb3 ;
 create table tb3 (
@@ -401,3 +400,4 @@ drop table t1;
 drop table t2;
 drop table t3;
 drop table t4;
+DROP TABLE test.tb3;
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_views.result b/mysql-test/suite/funcs_1/r/ndb_views.result
--- a/mysql-test/suite/funcs_1/r/ndb_views.result	2008-01-08 13:55:52 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_views.result	2008-03-12 12:56:05 +01:00
@@ -1,4 +1,3 @@
-SET @NO_REFRESH = IF( '' = '', 0, 1);
 USE test;
 drop table if exists tb2 ;
 create table tb2 (
@@ -22895,4 +22894,5 @@ DROP VIEW  IF EXISTS v1_secondview;
 DROP VIEW  IF EXISTS v2;
 DROP DATABASE IF EXISTS test2;
 DROP DATABASE IF EXISTS test3;
-DROP DATABASE IF EXISTS test1;
+DROP DATABASE test1;
+DROP TABLE test.tb2;
diff -Nrup a/mysql-test/suite/funcs_1/t/innodb_trig_03e.test b/mysql-test/suite/funcs_1/t/innodb_trig_03e.test
--- a/mysql-test/suite/funcs_1/t/innodb_trig_03e.test	2008-01-08 13:55:53 +01:00
+++ b/mysql-test/suite/funcs_1/t/innodb_trig_03e.test	2008-03-12 12:56:05 +01:00
@@ -7,24 +7,9 @@
 # 2. Set $engine_type
 let $engine_type= innodb;
 
-# Decide, if the objects are to be (re)created
-#
-# - once at the beginning of a set of testcases ('$NO_REFRESH' <> '' --> TRUE)
-#   That means the current script must not (re)create any object.
-#   It can expect, that the objects already exist.
-#
-# - per every testscript/case ('$NO_REFRESH' = '' --> FALSE)
-#   That means all objects have to be (re)created within the current script.
+# Create some objects needed in many testcases
+USE test;
 
-eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
-
-let $run= `SELECT @NO_REFRESH = 0`;
-if ($run)
-{
-    # Create some objects needed in many testcases
-    USE test;
-}
-    
 --source suite/funcs_1/triggers/triggers_03e_db_level.inc
 --source suite/funcs_1/triggers/triggers_03e_table_level.inc
 --source suite/funcs_1/triggers/triggers_03e_global_db_mix.inc
@@ -33,6 +18,4 @@ if ($run)
 --source suite/funcs_1/triggers/triggers_03e_definer.inc
 --source suite/funcs_1/triggers/triggers_03e_transaction.inc
 --source suite/funcs_1/triggers/triggers_03e_columns.inc
-
-
 
diff -Nrup a/mysql-test/suite/funcs_1/t/memory_trig_03e.test b/mysql-test/suite/funcs_1/t/memory_trig_03e.test
--- a/mysql-test/suite/funcs_1/t/memory_trig_03e.test	2008-01-08 13:55:54 +01:00
+++ b/mysql-test/suite/funcs_1/t/memory_trig_03e.test	2008-03-12 12:56:05 +01:00
@@ -5,23 +5,8 @@
 # Set $engine_type
 let $engine_type= memory;
 
-# Decide, if the objects are to be (re)created
-#
-# - once at the beginning of a set of testcases ('$NO_REFRESH' <> '' --> TRUE)
-#   That means the current script must not (re)create any object.
-#   It can expect, that the objects already exist.
-#
-# - per every testscript/case ('$NO_REFRESH' = '' --> FALSE)
-#   That means all objects have to be (re)created within the current script.
-
-eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
-
-let $run= `SELECT @NO_REFRESH = 0`;
-if ($run)
-{
-    # Create some objects needed in many testcases
-    USE test;
-}
+# Create some objects needed in many testcases
+USE test;
 
 --source suite/funcs_1/triggers/triggers_03e_db_level.inc
 --source suite/funcs_1/triggers/triggers_03e_table_level.inc
@@ -30,7 +15,4 @@ if ($run)
 --source suite/funcs_1/triggers/triggers_03e_prepare.inc
 --source suite/funcs_1/triggers/triggers_03e_definer.inc
 --source suite/funcs_1/triggers/triggers_03e_columns.inc
-
-
-
 
diff -Nrup a/mysql-test/suite/funcs_1/t/myisam_trig_03e.test b/mysql-test/suite/funcs_1/t/myisam_trig_03e.test
--- a/mysql-test/suite/funcs_1/t/myisam_trig_03e.test	2008-01-08 13:55:55 +01:00
+++ b/mysql-test/suite/funcs_1/t/myisam_trig_03e.test	2008-03-12 12:56:05 +01:00
@@ -5,23 +5,8 @@
 # Set $engine_type
 let $engine_type= myisam;
 
-# Decide, if the objects are to be (re)created
-#
-# - once at the beginning of a set of testcases ('$NO_REFRESH' <> '' --> TRUE)
-#   That means the current script must not (re)create any object.
-#   It can expect, that the objects already exist.
-#
-# - per every testscript/case ('$NO_REFRESH' = '' --> FALSE)
-#   That means all objects have to be (re)created within the current script.
-
-eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
-
-let $run= `SELECT @NO_REFRESH = 0`;
-if ($run)
-{
-    # Create some objects needed in many testcases
-    USE test;
-}
+# Create some objects needed in many testcases
+USE test;
 
 --source suite/funcs_1/triggers/triggers_03e_db_level.inc
 --source suite/funcs_1/triggers/triggers_03e_table_level.inc
@@ -30,8 +15,4 @@ if ($run)
 --source suite/funcs_1/triggers/triggers_03e_prepare.inc
 --source suite/funcs_1/triggers/triggers_03e_definer.inc
 --source suite/funcs_1/triggers/triggers_03e_columns.inc
-
-
-
-
 
diff -Nrup a/mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test b/mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
--- a/mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test	2008-03-11 20:17:22 +01:00
+++ b/mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test	2008-03-12 12:56:05 +01:00
@@ -5,15 +5,6 @@
 # Set $engine_type
 let $engine_type= myisam;
 
-# Decide, if the objects are to be (re)created
-#
-# - once at the beginning of a set of testcases ('$NO_REFRESH' <> '' --> TRUE)
-#   That means the current script must not (re)create any object.
-#   It can expect, that the objects already exist.
-#
-# - per every testscript/case ('$NO_REFRESH' = '' --> FALSE)
-#   That means all objects have to be (re)created within the current script.
-
 # Create some objects needed in many testcases
 USE test;
 --source suite/funcs_1/include/myisam_tb3.inc
diff -Nrup a/mysql-test/suite/funcs_1/t/ndb_bitdata.test b/mysql-test/suite/funcs_1/t/ndb_bitdata.test
--- a/mysql-test/suite/funcs_1/t/ndb_bitdata.test	2008-01-08 13:55:56 +01:00
+++ b/mysql-test/suite/funcs_1/t/ndb_bitdata.test	2008-03-12 12:56:05 +01:00
@@ -7,24 +7,12 @@
 # 2. Set $engine_type
 let $engine_type= ndb;
 
-# Decide, if the objects are to be (re)created
-#
-# - once at the beginning of a set of testcases ('$NO_REFRESH' <> '' --> TRUE)
-#   That means the current script must not (re)create any object.
-#   It can expect, that the objects already exist.
-#
-# - per every testscript/case ('$NO_REFRESH' = '' --> FALSE)
-#   That means all objects have to be (re)created within the current script.
+let $message= NOT YET IMPLEMENTED: bitdata tests;
+--source include/show_msg80.inc
+exit;
 
-eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
+# Create some objects needed in many testcases
+USE test;
+--source suite/funcs_1/include/ndb_tb4.inc
 
-let $run= `SELECT @NO_REFRESH = 0`;
-if ($run)
-{
-    # Create some objects needed in many testcases
-    USE test;
-    --source suite/funcs_1/include/ndb_tb4.inc
-}
-    
 --source suite/funcs_1/bitdata/bitdata_master.test
-
diff -Nrup a/mysql-test/suite/funcs_1/t/ndb_cursors.test b/mysql-test/suite/funcs_1/t/ndb_cursors.test
--- a/mysql-test/suite/funcs_1/t/ndb_cursors.test	2008-01-08 13:55:56 +01:00
+++ b/mysql-test/suite/funcs_1/t/ndb_cursors.test	2008-03-12 12:56:05 +01:00
@@ -7,24 +7,13 @@
 # 2. Set $engine_type
 let $engine_type= ndb;
 
-# Decide, if the objects are to be (re)created
-#
-# - once at the beginning of a set of testcases ('$NO_REFRESH' <> '' --> TRUE)
-#   That means the current script must not (re)create any object.
-#   It can expect, that the objects already exist.
-#
-# - per every testscript/case ('$NO_REFRESH' = '' --> FALSE)
-#   That means all objects have to be (re)created within the current script.
+let $message= NOT YET IMPLEMENTED: cursor tests;
+--source include/show_msg80.inc
+exit;
 
-eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
-
-let $run= `SELECT @NO_REFRESH = 0`;
-if ($run)
-{
-    # Create some objects needed in many testcases
-    USE test;
-    --source suite/funcs_1/include/ndb_tb1.inc
-}
+# Create some objects needed in many testcases
+USE test;
+--source suite/funcs_1/include/ndb_tb1.inc
 
 --source suite/funcs_1/cursors/cursors_master.test
 
diff -Nrup a/mysql-test/suite/funcs_1/t/ndb_trig_0102.test b/mysql-test/suite/funcs_1/t/ndb_trig_0102.test
--- a/mysql-test/suite/funcs_1/t/ndb_trig_0102.test	2008-01-08 13:55:56 +01:00
+++ b/mysql-test/suite/funcs_1/t/ndb_trig_0102.test	2008-03-12 12:56:05 +01:00
@@ -7,24 +7,10 @@
 # 2. Set $engine_type
 let $engine_type= ndb;
 
-# Decide, if the objects are to be (re)created
-#
-# - once at the beginning of a set of testcases ('$NO_REFRESH' <> '' --> TRUE)
-#   That means the current script must not (re)create any object.
-#   It can expect, that the objects already exist.
-#
-# - per every testscript/case ('$NO_REFRESH' = '' --> FALSE)
-#   That means all objects have to be (re)created within the current script.
+# Create some objects needed in many testcases
+USE test;
+--source suite/funcs_1/include/ndb_tb3.inc
 
-eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
-
-let $run= `SELECT @NO_REFRESH = 0`;
-if ($run)
-{
-    # Create some objects needed in many testcases
-    USE test;
-    --source suite/funcs_1/include/ndb_tb3.inc
-}
-    
 --source suite/funcs_1/triggers/triggers_0102.inc
+DROP TABLE test.tb3;
 
diff -Nrup a/mysql-test/suite/funcs_1/t/ndb_trig_03.test b/mysql-test/suite/funcs_1/t/ndb_trig_03.test
--- a/mysql-test/suite/funcs_1/t/ndb_trig_03.test	2008-01-08 13:55:56 +01:00
+++ b/mysql-test/suite/funcs_1/t/ndb_trig_03.test	2008-03-12 12:56:05 +01:00
@@ -7,24 +7,10 @@
 # 2. Set $engine_type
 let $engine_type= ndb;
 
-# Decide, if the objects are to be (re)created
-#
-# - once at the beginning of a set of testcases ('$NO_REFRESH' <> '' --> TRUE)
-#   That means the current script must not (re)create any object.
-#   It can expect, that the objects already exist.
-#
-# - per every testscript/case ('$NO_REFRESH' = '' --> FALSE)
-#   That means all objects have to be (re)created within the current script.
-
-eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
-
-let $run= `SELECT @NO_REFRESH = 0`;
-if ($run)
-{
-    # Create some objects needed in many testcases
-    USE test;
-    --source suite/funcs_1/include/ndb_tb3.inc
-}
+# Create some objects needed in many testcases
+USE test;
+--source suite/funcs_1/include/ndb_tb3.inc
     
 --source suite/funcs_1/triggers/triggers_03.inc
+DROP TABLE test.tb3;
 
diff -Nrup a/mysql-test/suite/funcs_1/t/ndb_trig_03e.test b/mysql-test/suite/funcs_1/t/ndb_trig_03e.test
--- a/mysql-test/suite/funcs_1/t/ndb_trig_03e.test	2008-01-08 13:55:56 +01:00
+++ b/mysql-test/suite/funcs_1/t/ndb_trig_03e.test	2008-03-12 12:56:05 +01:00
@@ -7,24 +7,9 @@
 # 2. Set $engine_type
 let $engine_type= ndb;
 
-# Decide, if the objects are to be (re)created
-#
-# - once at the beginning of a set of testcases ('$NO_REFRESH' <> '' --> TRUE)
-#   That means the current script must not (re)create any object.
-#   It can expect, that the objects already exist.
-#
-# - per every testscript/case ('$NO_REFRESH' = '' --> FALSE)
-#   That means all objects have to be (re)created within the current script.
+# Create some objects needed in many testcases
+USE test;
 
-eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
-
-let $run= `SELECT @NO_REFRESH = 0`;
-if ($run)
-{
-    # Create some objects needed in many testcases
-    USE test;
-}
-    
 --source suite/funcs_1/triggers/triggers_03e_db_level.inc
 --source suite/funcs_1/triggers/triggers_03e_table_level.inc
 --source suite/funcs_1/triggers/triggers_03e_global_db_mix.inc
@@ -33,7 +18,4 @@ if ($run)
 --source suite/funcs_1/triggers/triggers_03e_definer.inc
 --source suite/funcs_1/triggers/triggers_03e_transaction.inc
 --source suite/funcs_1/triggers/triggers_03e_columns.inc
-
-
-
 
diff -Nrup a/mysql-test/suite/funcs_1/t/ndb_trig_0407.test b/mysql-test/suite/funcs_1/t/ndb_trig_0407.test
--- a/mysql-test/suite/funcs_1/t/ndb_trig_0407.test	2008-01-08 13:55:56 +01:00
+++ b/mysql-test/suite/funcs_1/t/ndb_trig_0407.test	2008-03-12 12:56:05 +01:00
@@ -7,24 +7,10 @@
 # 2. Set $engine_type
 let $engine_type= ndb;
 
-# Decide, if the objects are to be (re)created
-#
-# - once at the beginning of a set of testcases ('$NO_REFRESH' <> '' --> TRUE)
-#   That means the current script must not (re)create any object.
-#   It can expect, that the objects already exist.
-#
-# - per every testscript/case ('$NO_REFRESH' = '' --> FALSE)
-#   That means all objects have to be (re)created within the current script.
+# Create some objects needed in many testcases
+USE test;
+--source suite/funcs_1/include/ndb_tb3.inc
 
-eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
-
-let $run= `SELECT @NO_REFRESH = 0`;
-if ($run)
-{
-    # Create some objects needed in many testcases
-    USE test;
-    --source suite/funcs_1/include/ndb_tb3.inc
-}
-    
 --source suite/funcs_1/triggers/triggers_0407.inc
+DROP TABLE test.tb3;
 
diff -Nrup a/mysql-test/suite/funcs_1/t/ndb_trig_08.test b/mysql-test/suite/funcs_1/t/ndb_trig_08.test
--- a/mysql-test/suite/funcs_1/t/ndb_trig_08.test	2008-01-08 13:55:56 +01:00
+++ b/mysql-test/suite/funcs_1/t/ndb_trig_08.test	2008-03-12 12:56:05 +01:00
@@ -7,24 +7,10 @@
 # 2. Set $engine_type
 let $engine_type= ndb;
 
-# Decide, if the objects are to be (re)created
-#
-# - once at the beginning of a set of testcases ('$NO_REFRESH' <> '' --> TRUE)
-#   That means the current script must not (re)create any object.
-#   It can expect, that the objects already exist.
-#
-# - per every testscript/case ('$NO_REFRESH' = '' --> FALSE)
-#   That means all objects have to be (re)created within the current script.
-
-eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
-
-let $run= `SELECT @NO_REFRESH = 0`;
-if ($run)
-{
-    # Create some objects needed in many testcases
-    USE test;
-    --source suite/funcs_1/include/ndb_tb3.inc
-}
+# Create some objects needed in many testcases
+USE test;
+--source suite/funcs_1/include/ndb_tb3.inc
     
 --source suite/funcs_1/triggers/triggers_08.inc
+DROP TABLE test.tb3;
 
diff -Nrup a/mysql-test/suite/funcs_1/t/ndb_trig_09.test b/mysql-test/suite/funcs_1/t/ndb_trig_09.test
--- a/mysql-test/suite/funcs_1/t/ndb_trig_09.test	2008-01-08 13:55:56 +01:00
+++ b/mysql-test/suite/funcs_1/t/ndb_trig_09.test	2008-03-12 12:56:05 +01:00
@@ -7,24 +7,10 @@
 # 2. Set $engine_type
 let $engine_type= ndb;
 
-# Decide, if the objects are to be (re)created
-#
-# - once at the beginning of a set of testcases ('$NO_REFRESH' <> '' --> TRUE)
-#   That means the current script must not (re)create any object.
-#   It can expect, that the objects already exist.
-#
-# - per every testscript/case ('$NO_REFRESH' = '' --> FALSE)
-#   That means all objects have to be (re)created within the current script.
+# Create some objects needed in many testcases
+USE test;
+--source suite/funcs_1/include/ndb_tb3.inc
 
-eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
-
-let $run= `SELECT @NO_REFRESH = 0`;
-if ($run)
-{
-    # Create some objects needed in many testcases
-    USE test;
-    --source suite/funcs_1/include/ndb_tb3.inc
-}
-    
 --source suite/funcs_1/triggers/triggers_09.inc
+DROP TABLE test.tb3;
 
diff -Nrup a/mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test b/mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test
--- a/mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test	2008-01-08 13:55:56 +01:00
+++ b/mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test	2008-03-12 12:56:05 +01:00
@@ -7,24 +7,10 @@
 # 2. Set $engine_type
 let $engine_type= ndb;
 
-# Decide, if the objects are to be (re)created
-#
-# - once at the beginning of a set of testcases ('$NO_REFRESH' <> '' --> TRUE)
-#   That means the current script must not (re)create any object.
-#   It can expect, that the objects already exist.
-#
-# - per every testscript/case ('$NO_REFRESH' = '' --> FALSE)
-#   That means all objects have to be (re)created within the current script.
+# Create some objects needed in many testcases
+USE test;
+--source suite/funcs_1/include/ndb_tb3.inc
 
-eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
-
-let $run= `SELECT @NO_REFRESH = 0`;
-if ($run)
-{
-    # Create some objects needed in many testcases
-    USE test;
-    --source suite/funcs_1/include/ndb_tb3.inc
-}
-    
 --source suite/funcs_1/triggers/triggers_1011ext.inc
+DROP TABLE test.tb3;
 
diff -Nrup a/mysql-test/suite/funcs_1/t/ndb_views.test b/mysql-test/suite/funcs_1/t/ndb_views.test
--- a/mysql-test/suite/funcs_1/t/ndb_views.test	2008-01-08 13:55:56 +01:00
+++ b/mysql-test/suite/funcs_1/t/ndb_views.test	2008-03-12 12:56:05 +01:00
@@ -7,38 +7,18 @@
 # 2. Set $engine_type
 let $engine_type= ndb;
 
-# Decide, if the objects are to be (re)created
-#
-# - once at the beginning of a set of testcases ('$NO_REFRESH' <> '' --> TRUE)
-#   That means the current script must not (re)create any object.
-#   It can expect, that the objects already exist.
-#
-# - per every testscript/case ('$NO_REFRESH' = '' --> FALSE)
-#   That means all objects have to be (re)created within the current script.
-
-eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
-
-let $run= `SELECT @NO_REFRESH = 0`;
-if ($run)
-{
-    # Create some objects needed in many testcases
-    USE test;
-    --source suite/funcs_1/include/ndb_tb2.inc
-    --disable_warnings
-    DROP DATABASE IF EXISTS test1;
-    --enable_warnings
-    CREATE DATABASE test1;
-    USE test1;
-    --source suite/funcs_1/include/ndb_tb2.inc
-    USE test;
-}
+# Create some objects needed in many testcases
+USE test;
+--source suite/funcs_1/include/ndb_tb2.inc
+--disable_warnings
+DROP DATABASE IF EXISTS test1;
+--enable_warnings
+CREATE DATABASE test1;
+USE test1;
+--source suite/funcs_1/include/ndb_tb2.inc
+USE test;
     
 --source suite/funcs_1/views/views_master.inc
-
-# If we created the database in the above loop we now need to drop it
-let $run= `SELECT @NO_REFRESH = 0`;
-if ($run)
-{
-    DROP DATABASE IF EXISTS test1;
-}
+DROP DATABASE test1;
+DROP TABLE test.tb2;
 
Thread
bk commit into 5.1 tree (mleich:1.2566) BUG#34532mleich12 Mar