copy from test-extra-5.1 to main tree

BitKeeper/etc/ignore:
  Added mysql-test/suite/funcs_1/r/innodb_views.warnings mysql-test/suite/funcs_1/r/memory_trig_03e.warnings mysql-test/suite/funcs_1/r/memory_views.warnings mysql-test/suite/funcs_1/r/myisam_trig_03e.warnings mysql-test/suite/funcs_1/r/myisam_views.warnings mysql-test/suite/funcs_1/r/ndb_trig_03e.warnings mysql-test/suite/funcs_1/r/ndb_views.warnings mysql-test/suite/partitions/r/diff mysql-test/suite/partitions/r/partition_bit_ndb.warnings mysql-test/suite/partitions/r/partition_special_innodb.warnings mysql-test/suite/partitions/r/partition_special_myisam.warnings storage/archive/archive_reader mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings to the ignore list
mysql-test/suite/funcs_2/include/check_charset.inc:
  inserted newline at the end of file.
mysql-test/suite/objects/include/drop_all.inc:
  inserted newline at the end of file.
mysql-test/suite/partitions/include/partition_key_32col.inc:
  inserted newline at the end of file.
mysql-test/suite/rpl/data/rpl_mixed.dat:
  inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_event.inc:
  inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_select.inc:
  inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_user.inc:
  inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_view.inc:
  inserted newline at the end of file.

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

@@ -0,0 +1,29 @@
+#### suite/funcs_1/t/a_version_check.test
+#
+# just a simple check of the version to be sure the correct server version is
+# checked against the funcs_1 tests.
+
+# just show machine and version to be sure we are testing the correct files
+#
+let $message= . Just show the version string for which the results in suite
+              . funcs_1 have been checked.
+              .
+              . I know that the .result file of this check needs to
+              . updated with each new version --- THIS IS INTENDED!;
+--source include/show_msg.inc
+
+--disable_query_log
+SELECT CONCAT('funcs_1 checked with version: ', SUBSTR(version(), 1, 6 ) ) AS " ";
+#SELECT CONCAT('aa = ', 'bb');
+#SELECT CONCAT('aa = ', 'bb') AS " ";
+
+if (0)
+{
+   # these more detailed results create differences between the OS.
+   # mioght be used later when we enable OS dependent .result files
+   --vertical_results
+   SELECT @@version_compile_os AS 'vers_comp_os', current_date;
+   SHOW VARIABLES LIKE 'vers%';
+   --horizontal_results
+}
+

mysql-test/suite/funcs_1/t/disabled.def

@@ -0,0 +1,16 @@
+##############################################################################
+#
+#  List the test cases that are to be disabled temporarely.
+#
+#  Separate the test case name and the comment with ':'.
+#
+#      <testcasename>  : Comment test
+#
+#  Don't use any TAB characters for whitespace.
+#
+##############################################################################
+
+innodb_storedproc: switched off (too much changed output from WL#2984, needs to be checked)
+memory_storedproc: switched off (too much changed output from WL#2984, needs to be checked)
+myisam_storedproc: switched off (too much changed output from WL#2984, needs to be checked)
+~

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

@@ -0,0 +1,7 @@
+#### suite/funcs_1/t/datadict_innodb.test
+#
+--source include/have_innodb.inc
+
+let $engine_type= innodb;
+
+--source suite/funcs_1/datadict/datadict_master.inc

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

@@ -0,0 +1,47 @@
+##### suite/funcs_1/funcs_1/t/innodb__load.test
+
+# InnoDB tables should be used
+#
+# 1. Check if InnoDB is available
+--source include/have_innodb.inc
+# 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 all objects have to be (re)created within the current script.
+#
+# - per every testscript/case ('$NO_REFRESH' = '' --> FALSE)
+#   That means the current script must not (re)create any object and every 
+#   testscript/case (re)creates only the objects it needs.
+
+eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --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
+
+    # The database test1 is needed for the VIEW testcases
+    --disable_warnings
+    DROP DATABASE IF EXISTS test1;
+    --enable_warnings
+    CREATE DATABASE test1;
+    USE test1;
+    --source suite/funcs_1/include/innodb_tb2.inc
+    USE test;
+  
+    # These tables are needed for the stored procedure testscases
+    --source suite/funcs_1/include/sp_tb.inc
+
+    let $run= 0;
+}
+

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

@@ -0,0 +1,34 @@
+#### suite/funcs_1/t/innodb_bitdata.test
+
+# InnoDB tables should be used
+#
+# 1. Check if InnoDB is available
+--source include/have_innodb.inc
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/innodb_tb4.inc
+
+    let $run= 0;
+}
+    
+--source suite/funcs_1/bitdata/bitdata_master.test
+

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

@@ -0,0 +1,34 @@
+#### suite/funcs_1/t/innodb_cursors.test
+
+# Innodb tables should be used
+#
+# 1. Check if InnoDB is available
+--source include/have_innodb.inc
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/innodb_tb1.inc
+
+    let $run= 0;
+}
+
+--source suite/funcs_1/cursors/cursors_master.test
+

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

@@ -0,0 +1,16 @@
+###################################################
+#                                                 #
+#  Functions within VIEWs based on InnoDB tables  #
+#                                                 #
+###################################################
+
+#
+# NOTE: PLEASE SEE THE DETAILED DESCRIPTION IN
+#       suite/funcs_1/views/func_view.inc
+#       BEFORE ADDING NEW TEST CASES HERE !!!
+
+let $type= 'InnoDB' ;
+--source include/have_innodb.inc
+
+--source suite/funcs_1/views/func_view.inc
+

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

@@ -0,0 +1,6 @@
+#### suite/funcs_1/t/innodb_storedproc.test
+#
+
+let $engine_type= innodb;
+
+--source suite/funcs_1/storedproc/storedproc_master.inc

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

@@ -0,0 +1,9 @@
+#### suite/funcs_1/t/innodb_storedproc_02.test
+#
+# 1. Check if InnoDB is available
+--source include/have_innodb.inc
+
+# 2. Set $engine_type
+let $engine_type= innodb;
+
+--source suite/funcs_1/storedproc/storedproc_02.inc

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

@@ -0,0 +1,9 @@
+#### suite/funcs_1/t/innodb_storedproc_03.test
+#
+# 1. Check if InnoDB is available
+--source include/have_innodb.inc
+
+# 2. Set $engine_type
+let $engine_type= innodb;
+
+--source suite/funcs_1/storedproc/storedproc_03.inc

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

@@ -0,0 +1,9 @@
+#### suite/funcs_1/t/innodb_storedproc_06.test
+#
+# 1. Check if InnoDB is available
+--source include/have_innodb.inc
+
+# 2. Set $engine_type
+let $engine_type= innodb;
+
+--source suite/funcs_1/storedproc/storedproc_06.inc

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

@@ -0,0 +1,9 @@
+#### suite/funcs_1/t/innodb_storedproc_07.test
+#
+# 1. Check if InnoDB is available
+--source include/have_innodb.inc
+
+# 2. Set $engine_type
+let $engine_type= innodb;
+
+--source suite/funcs_1/storedproc/storedproc_07.inc

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

@@ -0,0 +1,9 @@
+#### suite/funcs_1/t/innodb_storedproc_08.test
+#
+# 1. Check if InnoDB is available
+--source include/have_innodb.inc
+
+# 2. Set $engine_type
+let $engine_type= innodb;
+
+--source suite/funcs_1/storedproc/storedproc_08.inc

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

@@ -0,0 +1,9 @@
+#### suite/funcs_1/t/innodb_storedproc_10.test
+#
+# 1. Check if InnoDB is available
+--source include/have_innodb.inc
+
+# 2. Set $engine_type
+let $engine_type= innodb;
+
+--source suite/funcs_1/storedproc/storedproc_10.inc

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

@@ -0,0 +1,34 @@
+#### suite/funcs_1/t/innodb_triggers.test
+
+# InnoDB tables should be used
+#
+# 1. Check if InnoDB is available
+--source include/have_innodb.inc
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/innodb_tb3.inc
+
+    let $run= 0;
+}
+    
+--source suite/funcs_1/triggers/triggers_0102.inc
+

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

@@ -0,0 +1,34 @@
+#### suite/funcs_1/t/innodb_triggers.test
+
+# InnoDB tables should be used
+#
+# 1. Check if InnoDB is available
+--source include/have_innodb.inc
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/innodb_tb3.inc
+
+    let $run= 0;
+}
+    
+--source suite/funcs_1/triggers/triggers_03.inc
+

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

@@ -0,0 +1,41 @@
+#### suite/funcs_1/t/innodb_triggers.test
+
+# InnoDB tables should be used
+#
+# 1. Check if InnoDB is available
+--source include/have_innodb.inc
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    let $run= 0;
+}
+    
+--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
+--source suite/funcs_1/triggers/triggers_03e_db_table_mix.inc
+--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_transaction.inc
+--source suite/funcs_1/triggers/triggers_03e_columns.inc
+
+
+

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

@@ -0,0 +1,34 @@
+#### suite/funcs_1/t/innodb_triggers.test
+
+# InnoDB tables should be used
+#
+# 1. Check if InnoDB is available
+--source include/have_innodb.inc
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/innodb_tb3.inc
+
+    let $run= 0;
+}
+    
+--source suite/funcs_1/triggers/triggers_0407.inc
+

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

@@ -0,0 +1,34 @@
+#### suite/funcs_1/t/innodb_triggers.test
+
+# InnoDB tables should be used
+#
+# 1. Check if InnoDB is available
+--source include/have_innodb.inc
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/innodb_tb3.inc
+
+    let $run= 0;
+}
+    
+--source suite/funcs_1/triggers/triggers_08.inc
+

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

@@ -0,0 +1,34 @@
+#### suite/funcs_1/t/innodb_triggers.test
+
+# InnoDB tables should be used
+#
+# 1. Check if InnoDB is available
+--source include/have_innodb.inc
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/innodb_tb3.inc
+
+    let $run= 0;
+}
+    
+--source suite/funcs_1/triggers/triggers_09.inc
+

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

@@ -0,0 +1,34 @@
+#### suite/funcs_1/t/innodb_triggers.test
+
+# InnoDB tables should be used
+#
+# 1. Check if InnoDB is available
+--source include/have_innodb.inc
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/innodb_tb3.inc
+
+    let $run= 0;
+}
+    
+--source suite/funcs_1/triggers/triggers_1011ext.inc
+

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

@@ -0,0 +1,34 @@
+#### suite/funcs_1/t/innodb_triggers.test
+
+# InnoDB tables should be used
+#
+# 1. Check if InnoDB is available
+--source include/have_innodb.inc
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/innodb_tb3.inc
+
+    let $run= 0;
+}
+    
+--source suite/funcs_1/triggers/trig_frkey.inc
+

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

@@ -0,0 +1,46 @@
+#### suite/funcs_1/t/innodb_views.test
+
+# InnoDB tables should be used
+#
+# 1. Check if InnoDB is available
+--source include/have_innodb.inc
+# 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;
+    --source suite/funcs_1/include/innodb_tb2.inc
+    --disable_warnings
+    DROP DATABASE IF EXISTS test1;
+    --enable_warnings
+    CREATE DATABASE test1;
+    USE test1;
+    --source suite/funcs_1/include/innodb_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;
+}
+

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

@@ -0,0 +1,5 @@
+#### suite/funcs_1/t/datadict_memory.test
+#
+let $engine_type= memory;
+
+--source suite/funcs_1/datadict/datadict_master.inc

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

@@ -0,0 +1,45 @@
+##### suite/funcs_1/funcs_1/t/memory__load.test
+
+# Memory tables should be used
+#
+# 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 all objects have to be (re)created within the current script.
+#
+# - per every testscript/case ('$NO_REFRESH' = '' --> FALSE)
+#   That means the current script must not (re)create any object and every 
+#   testscript/case (re)creates only the objects it needs.
+
+eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --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
+
+    # The database test1 is needed for the VIEW testcases
+    --disable_warnings
+    DROP DATABASE IF EXISTS test1;
+    --enable_warnings
+    CREATE DATABASE test1;
+    USE test1;
+    --source suite/funcs_1/include/memory_tb2.inc
+    USE test;
+  
+    # These tables are needed for the stored procedure testscases
+    --source suite/funcs_1/include/sp_tb.inc
+
+    let $run= 0;
+}
+

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

@@ -0,0 +1,32 @@
+#### suite/funcs_1/t/memory_bitdata
+
+# Memory tables should be used
+#
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/memory_tb4.inc
+
+    let $run= 0;
+}
+
+--source suite/funcs_1/bitdata/bitdata_master.test
+

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

@@ -0,0 +1,32 @@
+#### suite/funcs_1/t/memory_cursors.test
+
+# Memory tables should be used
+#
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/memory_tb1.inc
+
+    let $run= 0;
+}
+
+--source suite/funcs_1/cursors/cursors_master.test
+

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

@@ -0,0 +1,15 @@
+###################################################
+#                                                 #
+#  Functions within VIEWs based on Memory tables  #
+#                                                 #
+###################################################
+
+#
+# NOTE: PLEASE SEE THE DETAILED DESCRIPTION IN
+#       suite/funcs_1/views/func_view.inc
+#       BEFORE ADDING NEW TEST CASES HERE !!!
+
+let $type= 'MEMORY' ;
+
+--source suite/funcs_1/views/func_view.inc
+

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

@@ -0,0 +1,6 @@
+#### suite/funcs_1/t/memory_storedproc.test
+#
+
+let $engine_type= memory;
+
+--source suite/funcs_1/storedproc/storedproc_master.inc

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

@@ -0,0 +1,6 @@
+#### suite/funcs_1/t/memory_storedproc_02.test
+#
+ 
+let $engine_type= memory;
+ 
+--source suite/funcs_1/storedproc/storedproc_02.inc

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

@@ -0,0 +1,6 @@
+#### suite/funcs_1/t/memory_storedproc_03.test
+#
+ 
+let $engine_type= memory;
+ 
+--source suite/funcs_1/storedproc/storedproc_03.inc

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

@@ -0,0 +1,6 @@
+#### suite/funcs_1/t/memory_storedproc_06.test
+#
+ 
+let $engine_type= memory;
+ 
+--source suite/funcs_1/storedproc/storedproc_06.inc

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

@@ -0,0 +1,6 @@
+#### suite/funcs_1/t/memory_storedproc_07.test
+#
+ 
+let $engine_type= memory;
+ 
+--source suite/funcs_1/storedproc/storedproc_07.inc

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

@@ -0,0 +1,6 @@
+#### suite/funcs_1/t/memory_storedproc_08.test
+#
+ 
+let $engine_type= memory;
+ 
+--source suite/funcs_1/storedproc/storedproc_08.inc

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

@@ -0,0 +1,6 @@
+#### suite/funcs_1/t/memory_storedproc_10.test
+#
+ 
+let $engine_type= memory;
+ 
+--source suite/funcs_1/storedproc/storedproc_10.inc

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

@@ -0,0 +1,32 @@
+#### suite/funcs_1/t/memory_triggers.test
+
+# Memory tables should be used
+#
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/memory_tb3.inc
+
+    let $run= 0;
+}
+
+--source suite/funcs_1/triggers/triggers_0102.inc
+

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

@@ -0,0 +1,32 @@
+#### suite/funcs_1/t/memory_triggers.test
+
+# Memory tables should be used
+#
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/memory_tb3.inc
+
+    let $run= 0;
+}
+
+--source suite/funcs_1/triggers/triggers_03.inc
+

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

@@ -0,0 +1,39 @@
+#### suite/funcs_1/t/memory_triggers.test
+
+# Memory tables should be used
+#
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    let $run= 0;
+}
+
+--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
+--source suite/funcs_1/triggers/triggers_03e_db_table_mix.inc
+--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
+
+
+
+

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

@@ -0,0 +1,32 @@
+#### suite/funcs_1/t/memory_triggers.test
+
+# Memory tables should be used
+#
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/memory_tb3.inc
+
+    let $run= 0;
+}
+
+--source suite/funcs_1/triggers/triggers_0407.inc
+

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

@@ -0,0 +1,32 @@
+#### suite/funcs_1/t/memory_triggers.test
+
+# Memory tables should be used
+#
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/memory_tb3.inc
+
+    let $run= 0;
+}
+
+--source suite/funcs_1/triggers/triggers_08.inc
+

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

@@ -0,0 +1,32 @@
+#### suite/funcs_1/t/memory_triggers.test
+
+# Memory tables should be used
+#
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/memory_tb3.inc
+
+    let $run= 0;
+}
+
+--source suite/funcs_1/triggers/triggers_09.inc
+

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

@@ -0,0 +1,32 @@
+#### suite/funcs_1/t/memory_triggers.test
+
+# Memory tables should be used
+#
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/memory_tb3.inc
+
+    let $run= 0;
+}
+
+--source suite/funcs_1/triggers/triggers_1011ext.inc
+

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

@@ -0,0 +1,44 @@
+#### suite/funcs_1/t/memory_views.test
+
+# Memory tables should be used
+#
+# 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;
+    --source suite/funcs_1/include/memory_tb2.inc
+    --disable_warnings
+    DROP DATABASE IF EXISTS test1;
+    --enable_warnings
+    CREATE DATABASE test1;
+    USE test1;
+    --source suite/funcs_1/include/memory_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;
+}
+

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

@@ -0,0 +1,5 @@
+#### suite/funcs_1/t/datadict_myisam.test
+#
+let $engine_type= myisam;
+
+--source suite/funcs_1/datadict/datadict_master.inc

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

@@ -0,0 +1,45 @@
+##### suite/funcs_1/funcs_1/t/myisam__load.test
+
+# MyISAM tables should be used
+#
+# 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 all objects have to be (re)created within the current script.
+#
+# - per every testscript/case ('$NO_REFRESH' = '' --> FALSE)
+#   That means the current script must not (re)create any object and every 
+#   testscript/case (re)creates only the objects it needs.
+
+eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --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
+
+    # The database test1 is needed for the VIEW testcases
+    --disable_warnings
+    DROP DATABASE IF EXISTS test1;
+    --enable_warnings
+    CREATE DATABASE test1;
+    USE test1;
+    --source suite/funcs_1/include/myisam_tb2.inc
+    USE test;
+  
+    # These tables are needed for the stored procedure testscases
+    --source suite/funcs_1/include/sp_tb.inc
+
+    let $run= 0;
+}
+

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

@@ -0,0 +1,32 @@
+#### suite/funcs_1/t/myisam_bitdata.test
+
+# MyISAM tables should be used
+#
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/myisam_tb4.inc
+
+    let $run= 0;
+}
+
+--source suite/funcs_1/bitdata/bitdata_master.test
+

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

@@ -0,0 +1,32 @@
+#### suite/funcs_1/t/myisam_cursors.test
+
+# MyISAM tables should be used
+#
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/myisam_tb1.inc
+
+    let $run= 0;
+}
+
+--source suite/funcs_1/cursors/cursors_master.test
+

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

@@ -0,0 +1,15 @@
+###################################################
+#                                                 #
+#  Functions within VIEWs based on MYISAM tables  #
+#                                                 #
+###################################################
+
+#
+# NOTE: PLEASE SEE THE DETAILED DESCRIPTION IN
+#       suite/funcs_1/views/func_view.inc
+#       BEFORE ADDING NEW TEST CASES HERE !!!
+
+let $type= 'MYISAM' ;
+
+--source suite/funcs_1/views/func_view.inc
+

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

@@ -0,0 +1,6 @@
+#### suite/funcs_1/t/myisam_storedproc.test
+#
+
+let $engine_type= myisam;
+
+--source suite/funcs_1/storedproc/storedproc_master.inc

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

@@ -0,0 +1,6 @@
+#### suite/funcs_1/t/myisam_storedproc_02.test
+#
+ 
+let $engine_type= myisam;
+ 
+--source suite/funcs_1/storedproc/storedproc_02.inc

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

@@ -0,0 +1,6 @@
+#### suite/funcs_1/t/myisam_storedproc_03.test
+#
+ 
+let $engine_type= myisam;
+ 
+--source suite/funcs_1/storedproc/storedproc_03.inc

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

@@ -0,0 +1,6 @@
+#### suite/funcs_1/t/myisam_storedproc_06.test
+#
+ 
+let $engine_type= myisam;
+ 
+--source suite/funcs_1/storedproc/storedproc_06.inc

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

@@ -0,0 +1,6 @@
+#### suite/funcs_1/t/myisam_storedproc_07.test
+#
+ 
+let $engine_type= myisam;
+ 
+--source suite/funcs_1/storedproc/storedproc_07.inc

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

@@ -0,0 +1,6 @@
+#### suite/funcs_1/t/myisam_storedproc_08.test
+#
+ 
+let $engine_type= myisam;
+ 
+--source suite/funcs_1/storedproc/storedproc_08.inc

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

@@ -0,0 +1,6 @@
+#### suite/funcs_1/t/myisam_storedproc_10.test
+#
+ 
+let $engine_type= myisam;
+ 
+--source suite/funcs_1/storedproc/storedproc_10.inc

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

@@ -0,0 +1,32 @@
+#### suite/funcs_1/t/myisam_triggers.test
+
+# MyISAM tables should be used
+#
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/myisam_tb3.inc
+
+    let $run= 0;
+}
+
+--source suite/funcs_1/triggers/triggers_0102.inc
+

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

@@ -0,0 +1,32 @@
+#### suite/funcs_1/t/myisam_triggers.test
+
+# MyISAM tables should be used
+#
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/myisam_tb3.inc
+
+    let $run= 0;
+}
+
+--source suite/funcs_1/triggers/triggers_03.inc
+

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

@@ -0,0 +1,40 @@
+#### suite/funcs_1/t/myisam_triggers.test
+
+# MyISAM tables should be used
+#
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    let $run= 0;
+}
+
+--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
+--source suite/funcs_1/triggers/triggers_03e_db_table_mix.inc
+--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
+
+
+
+
+

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

@@ -0,0 +1,32 @@
+#### suite/funcs_1/t/myisam_triggers.test
+
+# MyISAM tables should be used
+#
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/myisam_tb3.inc
+
+    let $run= 0;
+}
+
+--source suite/funcs_1/triggers/triggers_0407.inc
+

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

@@ -0,0 +1,32 @@
+#### suite/funcs_1/t/myisam_triggers.test
+
+# MyISAM tables should be used
+#
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/myisam_tb3.inc
+
+    let $run= 0;
+}
+
+--source suite/funcs_1/triggers/triggers_08.inc
+

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

@@ -0,0 +1,32 @@
+#### suite/funcs_1/t/myisam_triggers.test
+
+# MyISAM tables should be used
+#
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/myisam_tb3.inc
+
+    let $run= 0;
+}
+
+--source suite/funcs_1/triggers/triggers_09.inc
+

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

@@ -0,0 +1,32 @@
+#### suite/funcs_1/t/myisam_triggers.test
+
+# MyISAM tables should be used
+#
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/myisam_tb3.inc
+
+    let $run= 0;
+}
+
+--source suite/funcs_1/triggers/triggers_1011ext.inc
+

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

@@ -0,0 +1,49 @@
+#### suite/funcs_1/t/myisam_views.test
+
+# MyISAM tables should be used
+#
+# 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;
+    --source suite/funcs_1/include/myisam_tb2.inc
+    --disable_warnings
+    DROP DATABASE IF EXISTS test1;
+    --enable_warnings
+    CREATE DATABASE test1;
+    USE test1;
+    --source suite/funcs_1/include/myisam_tb2.inc
+    USE test;
+
+}
+
+let $message= Attention: The nesting level @max_level in Testcase 3.3.1.A6
+              (Complicated nested VIEWs) has to be limited to 20 because of
+              MyISAM(only) performance issues Bug#11948;
+--source include/show_msg80.inc
+SET @limit1 = 20;
+--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;
+}
+

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

@@ -0,0 +1,7 @@
+#### suite/funcs_1/t/datadict_ndb.test
+#
+--source include/have_ndb.inc
+
+let $engine_type= ndb;
+
+--source suite/funcs_1/datadict/datadict_master.inc

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

@@ -0,0 +1,47 @@
+##### suite/funcs_1/funcs_1/t/ndb__load.test
+
+# ndb tables should be used
+#
+# 1. Check if ndb is available
+--source include/have_ndb.inc
+# 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 all objects have to be (re)created within the current script.
+#
+# - per every testscript/case ('$NO_REFRESH' = '' --> FALSE)
+#   That means the current script must not (re)create any object and every 
+#   testscript/case (re)creates only the objects it needs.
+
+eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --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
+
+    # The database test1 is needed for the VIEW testcases
+    --disable_warnings
+    DROP DATABASE IF EXISTS test1;
+    --enable_warnings
+    CREATE DATABASE test1;
+    USE test1;
+    --source suite/funcs_1/include/ndb_tb2.inc
+    USE test;
+  
+    # These tables are needed for the stored procedure testscases
+    --source suite/funcs_1/include/sp_tb.inc
+
+    let $run= 0;
+}
+

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

@@ -0,0 +1,34 @@
+#### suite/funcs_1/t/ndb_bitdata.test
+
+# InnoDB tables should be used
+#
+# 1. Check if InnoDB is available
+--source include/have_ndb.inc
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/ndb_tb4.inc
+
+    let $run= 0;
+}
+    
+--source suite/funcs_1/bitdata/bitdata_master.test
+

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

@@ -0,0 +1,34 @@
+#### suite/funcs_1/t/ndb_cursors.test
+
+# Innodb tables should be used
+#
+# 1. Check if ndb is available
+--source include/have_ndb.inc
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/ndb_tb1.inc
+
+    let $run= 0;
+}
+
+--source suite/funcs_1/cursors/cursors_master.test
+

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

@@ -0,0 +1,16 @@
+###################################################
+#                                                 #
+#  Functions within VIEWs based on ndb tables  #
+#                                                 #
+###################################################
+
+#
+# NOTE: PLEASE SEE THE DETAILED DESCRIPTION IN
+#       suite/funcs_1/views/func_view.inc
+#       BEFORE ADDING NEW TEST CASES HERE !!!
+
+let $type= 'ndb' ;
+--source include/have_ndb.inc
+
+--source suite/funcs_1/views/func_view.inc
+

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

@@ -0,0 +1,9 @@
+#### suite/funcs_1/t/ndb_storedproc_02.test
+#
+# 1. Check if ndb is available
+--source include/have_ndb.inc
+
+# 2. Set $engine_type
+let $engine_type= ndb;
+
+--source suite/funcs_1/storedproc/storedproc_02.inc

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

@@ -0,0 +1,9 @@
+#### suite/funcs_1/t/ndb_storedproc_03.test
+#
+# 1. Check if nsd is available
+--source include/have_ndb.inc
+
+# 2. Set $engine_type
+let $engine_type= ndb;
+
+--source suite/funcs_1/storedproc/storedproc_03.inc

mysql-test/suite/funcs_1/t/ndb_storedproc_06.tes

@@ -0,0 +1,9 @@
+#### suite/funcs_1/t/innodb_storedproc_06.test
+#
+# 1. Check if InnoDB is available
+--source include/have_innodb.inc
+
+# 2. Set $engine_type
+let $engine_type= innodb;
+
+--source suite/funcs_1/storedproc/storedproc_06.inc

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

@@ -0,0 +1,9 @@
+#### suite/funcs_1/t/ndb_storedproc_06.test
+#
+# 1. Check if ndb is available
+--source include/have_ndb.inc
+
+# 2. Set $engine_type
+let $engine_type= ndb;
+
+--source suite/funcs_1/storedproc/storedproc_06.inc

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

@@ -0,0 +1,9 @@
+#### suite/funcs_1/t/ndb_storedproc_07.test
+#
+# 1. Check if ndb is available
+--source include/have_ndb.inc
+
+# 2. Set $engine_type
+let $engine_type= ndb;
+
+--source suite/funcs_1/storedproc/storedproc_07.inc

mysql-test/suite/funcs_1/t/ndb_storedproc_08.tes

@@ -0,0 +1,9 @@
+#### suite/funcs_1/t/innodb_storedproc_08.test
+#
+# 1. Check if InnoDB is available
+--source include/have_innodb.inc
+
+# 2. Set $engine_type
+let $engine_type= innodb;
+
+--source suite/funcs_1/storedproc/storedproc_08.inc

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

@@ -0,0 +1,9 @@
+#### suite/funcs_1/t/ndb_storedproc_08.test
+#
+# 1. Check if ndb is available
+--source include/have_ndb.inc
+
+# 2. Set $engine_type
+let $engine_type= ndb;
+
+--source suite/funcs_1/storedproc/storedproc_08.inc

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

@@ -0,0 +1,9 @@
+#### suite/funcs_1/t/ndb_storedproc_10.test
+#
+# 1. Check if ndb is available
+--source include/have_ndb.inc
+
+# 2. Set $engine_type
+let $engine_type= ndb;
+
+--source suite/funcs_1/storedproc/storedproc_10.inc

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

@@ -0,0 +1,34 @@
+#### suite/funcs_1/t/ndb_triggers.test
+
+# ndb tables should be used
+#
+# 1. Check if ndb is available
+--source include/have_ndb.inc
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/ndb_tb3.inc
+
+    let $run= 0;
+}
+    
+--source suite/funcs_1/triggers/triggers_0102.inc
+

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

@@ -0,0 +1,34 @@
+#### suite/funcs_1/t/ndb_triggers.test
+
+# InnoDB tables should be used
+#
+# 1. Check if NDB is available
+--source include/have_ndb.inc
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/ndb_tb3.inc
+
+    let $run= 0;
+}
+    
+--source suite/funcs_1/triggers/triggers_03.inc
+

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

@@ -0,0 +1,42 @@
+#### suite/funcs_1/t/ndb_triggers.test
+
+# InnoDB tables should be used
+#
+# 1. Check if NDB is available
+--source include/have_ndb.inc
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    let $run= 0;
+}
+    
+--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
+--source suite/funcs_1/triggers/triggers_03e_db_table_mix.inc
+--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_transaction.inc
+--source suite/funcs_1/triggers/triggers_03e_columns.inc
+
+
+
+

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

@@ -0,0 +1,34 @@
+#### suite/funcs_1/t/ndb_triggers.test
+
+# ndb tables should be used
+#
+# 1. Check if ndb is available
+--source include/have_ndb.inc
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/ndb_tb3.inc
+
+    let $run= 0;
+}
+    
+--source suite/funcs_1/triggers/triggers_0407.inc
+

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

@@ -0,0 +1,34 @@
+#### suite/funcs_1/t/ndb_triggers.test
+
+# ndb tables should be used
+#
+# 1. Check if ndb is available
+--source include/have_ndb.inc
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/ndb_tb3.inc
+
+    let $run= 0;
+}
+    
+--source suite/funcs_1/triggers/triggers_08.inc
+

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

@@ -0,0 +1,34 @@
+#### suite/funcs_1/t/ndb_triggers.test
+
+# ndb tables should be used
+#
+# 1. Check if ndb is available
+--source include/have_ndb.inc
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/ndb_tb3.inc
+
+    let $run= 0;
+}
+    
+--source suite/funcs_1/triggers/triggers_09.inc
+

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

@@ -0,0 +1,34 @@
+#### suite/funcs_1/t/ndb_triggers.test
+
+# ndb tables should be used
+#
+# 1. Check if ndb is available
+--source include/have_ndb.inc
+# 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);
+
+# FIXME Replace the following, when "if" for mysqltest is available
+let $run= `SELECT @NO_REFRESH = 0`;
+while ($run)
+{
+
+    # Create some objects needed in many testcases
+    USE test;
+    --source suite/funcs_1/include/ndb_tb3.inc
+
+    let $run= 0;
+}
+    
+--source suite/funcs_1/triggers/triggers_1011ext.inc
+

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

@@ -0,0 +1,46 @@
+#### suite/funcs_1/t/ndb_views.test
+
+# ndb tables should be used
+#
+# 1. Check if ndb is available
+--source include/have_ndb.inc
+# 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;
+
+}
+    
+--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;
+}
+