Merge five.local.lan:/work/merge/mysql-5.1-funcs_1

into  five.local.lan:/work/trees/mysql-5.1-build-src-clean

mysql-test/suite/funcs_1/datadict/datadict_load.inc

@@ -71,67 +71,51 @@ let $engine_ndb=    `SELECT @ENGINE_NDB    = 1`;
 # Note: The NDB variant with their own tb1 - tb4 tables is not ready for use.
 let $engine_ndb= 0;
 
-# 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)
-{
-   --disable_warnings
-   DROP DATABASE IF EXISTS test1;
-   --enable_warnings
-   CREATE DATABASE test1;
-   USE test;
+--disable_warnings
+DROP DATABASE IF EXISTS test1;
+--enable_warnings
+CREATE DATABASE test1;
+USE test;
 
-   # until a statement 'eval --source suite/funcs_1/include/$var_tb1.inc
-   # works we need to have similar statements for each $engine
-   if ($engine_innodb)
-   {
+if ($engine_innodb)
+{
     --source suite/funcs_1/include/innodb_tb1.inc
     --source suite/funcs_1/include/innodb_tb2.inc
     --source suite/funcs_1/include/innodb_tb3.inc
     --source suite/funcs_1/include/innodb_tb4.inc
     USE test1;
     --source suite/funcs_1/include/innodb_tb2.inc
-   }
+}
 
-   if ($engine_memory)
-   {
+if ($engine_memory)
+{
    --source suite/funcs_1/include/memory_tb1.inc
    --source suite/funcs_1/include/memory_tb2.inc
    --source suite/funcs_1/include/memory_tb3.inc
    --source suite/funcs_1/include/memory_tb4.inc
    USE test1;
    --source suite/funcs_1/include/memory_tb2.inc
-   }
+}
 
-   if ($engine_myisam)
-   {
+if ($engine_myisam)
+{
    --source suite/funcs_1/include/myisam_tb1.inc
    --source suite/funcs_1/include/myisam_tb2.inc
    --source suite/funcs_1/include/myisam_tb3.inc
    --source suite/funcs_1/include/myisam_tb4.inc
    USE test1;
    --source suite/funcs_1/include/myisam_tb2.inc
-   }
+}
 
-   if ($engine_ndb)
-   {
+if ($engine_ndb)
+{
     --source suite/funcs_1/include/ndb_tb1.inc
     --source suite/funcs_1/include/ndb_tb2.inc
     --source suite/funcs_1/include/ndb_tb3.inc
     --source suite/funcs_1/include/ndb_tb4.inc
     USE test1;
     --source suite/funcs_1/include/ndb_tb2.inc
-   }
-
-   USE test;
-   --source suite/funcs_1/include/sp_tb.inc
 }
+
+USE test;
+--source suite/funcs_1/include/sp_tb.inc

mysql-test/suite/funcs_1/r/innodb_trig_03e.result

-SET @NO_REFRESH = IF( '' = '', 0, 1);
 USE test;
 
 Testcase for db level:

mysql-test/suite/funcs_1/r/is_columns_innodb.result

-SET @NO_REFRESH = IF( '' = '', 0, 1);
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1;
 USE test;

mysql-test/suite/funcs_1/r/is_columns_memory.result

 SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
-SET @NO_REFRESH = IF( '' = '', 0, 1);
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1;
 USE test;

mysql-test/suite/funcs_1/r/is_columns_myisam.result

 SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
-SET @NO_REFRESH = IF( '' = '', 0, 1);
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1;
 USE test;

mysql-test/suite/funcs_1/r/is_columns_ndb.result

-SET @NO_REFRESH = IF( '' = '', 0, 1);
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1;
 USE test;

mysql-test/suite/funcs_1/r/is_tables_innodb.result

-SET @NO_REFRESH = IF( '' = '', 0, 1);
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1;
 USE test;

mysql-test/suite/funcs_1/r/is_tables_memory.result

 SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
-SET @NO_REFRESH = IF( '' = '', 0, 1);
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1;
 USE test;

mysql-test/suite/funcs_1/r/is_tables_myisam.result

 SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
-SET @NO_REFRESH = IF( '' = '', 0, 1);
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1;
 USE test;

mysql-test/suite/funcs_1/r/is_tables_ndb.result

-SET @NO_REFRESH = IF( '' = '', 0, 1);
 DROP DATABASE IF EXISTS test1;
 CREATE DATABASE test1;
 USE test;

mysql-test/suite/funcs_1/r/memory_trig_03e.result

-SET @NO_REFRESH = IF( '' = '', 0, 1);
 USE test;
 
 Testcase for db level:

mysql-test/suite/funcs_1/r/myisam_trig_03e.result

-SET @NO_REFRESH = IF( '' = '', 0, 1);
 USE test;
 
 Testcase for db level:

mysql-test/suite/funcs_1/r/ndb_bitdata.result

-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
 --------------------------------------------------------------------------------

mysql-test/suite/funcs_1/r/ndb_cursors.result

-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
 --------------------------------------------------------------------------------

mysql-test/suite/funcs_1/r/ndb_trig_0102.result

-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_var3;
 trig1_b	trig1_a	trig2
 drop database trig_db1;
 drop database trig_db2;
+DROP TABLE test.tb3;

mysql-test/suite/funcs_1/r/ndb_trig_03.result

-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;

mysql-test/suite/funcs_1/r/ndb_trig_03e.result

-SET @NO_REFRESH = IF( '' = '', 0, 1);
 USE test;
 
 Testcase for db level:

mysql-test/suite/funcs_1/r/ndb_trig_0407.result

-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;

mysql-test/suite/funcs_1/r/ndb_trig_08.result

-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 is not allowed in stored function or tr
 drop user test_general@localhost;
 drop user test_general;
 drop user test_super@localhost;
+DROP TABLE test.tb3;

mysql-test/suite/funcs_1/r/ndb_trig_09.result

-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;

mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result

-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;

mysql-test/suite/funcs_1/r/ndb_views.result

-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;

mysql-test/suite/funcs_1/t/innodb_trig_03e.test

@@ -7,23 +7,8 @@
 # 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.
-
-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
@@ -34,5 +19,3 @@ if ($run)
 --source suite/funcs_1/triggers/triggers_03e_transaction.inc
 --source suite/funcs_1/triggers/triggers_03e_columns.inc
 
-
-

mysql-test/suite/funcs_1/t/memory_trig_03e.test

@@ -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
@@ -31,6 +16,3 @@ if ($run)
 --source suite/funcs_1/triggers/triggers_03e_definer.inc
 --source suite/funcs_1/triggers/triggers_03e_columns.inc
 
-
-
-