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

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


mysql-test/suite/funcs_1/cursors/cursors_master.test:
  Auto merged
BitKeeper/deleted/.del-innodb_triggers.result:
  Auto merged
BitKeeper/deleted/.del-memory_triggers.result:
  Auto merged
BitKeeper/deleted/.del-myisam_triggers.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  SCCS merged
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  SCCS merged
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  SCCS merged
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  SCCS merged
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  SCCS merged
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  SCCS merged
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  SCCS merged
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  SCCS merged
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  SCCS merged
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  SCCS merged
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  SCCS merged
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  SCCS merged
mysql-test/suite/funcs_1/t/innodb_storedproc.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc.test:
  Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  manual merge
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
  manual merge
mysql-test/suite/funcs_1/r/myisam_views.result:
  manual merge

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)
-   {
-       --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)
-   {
-      --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_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_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_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_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
-   }
+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
+}
 
-   USE test;
-   --source suite/funcs_1/include/sp_tb.inc
+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

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;