List:Commits« Previous MessageNext Message »
From:marc.alff Date:September 27 2006 10:39pm
Subject:bk commit into 5.1 tree (malff:1.2308)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of marcsql. When marcsql 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, 2006-09-27 15:39:14-07:00, malff@weblab.(none) +15 -0
  Intermediate CSET, please ignore.

  mysql-test/r/func_math.result@stripped, 2006-09-27 11:02:13-07:00, malff@weblab.(none) +12 -0
    rework

  mysql-test/r/func_misc.result@stripped, 2006-09-27 11:02:13-07:00, malff@weblab.(none) +112 -0
    rework

  mysql-test/r/join_outer.result@stripped, 2006-09-27 11:00:31-07:00, malff@weblab.(none) +0 -3
    rework

  mysql-test/r/parser_stress_func_innodb.result@stripped, 2006-09-27 11:00:31-07:00, malff@weblab.(none) +61 -3842
    rework

  mysql-test/t/func_math.test@stripped, 2006-09-27 11:00:31-07:00, malff@weblab.(none) +5 -0
    improved coverage

  mysql-test/t/func_misc.test@stripped, 2006-09-27 11:00:31-07:00, malff@weblab.(none) +139 -0
    improved coverage

  mysql-test/t/parser_stress_func_innodb.test@stripped, 2006-09-27 11:00:31-07:00, malff@weblab.(none) +13 -4
    rework

  sql/item_create.cc@stripped, 2006-09-27 15:34:03-07:00, malff@weblab.(none) +277 -215
    HASH table implementation

  sql/item_create.cc@stripped, 2006-09-27 11:02:13-07:00, malff@weblab.(none) +36 -132
    rework

  sql/item_create.h@stripped, 2006-09-27 15:34:03-07:00, malff@weblab.(none) +0 -1
    cleanup

  sql/item_create.h@stripped, 2006-09-27 11:02:13-07:00, malff@weblab.(none) +0 -78
    rework

  sql/lex.h@stripped, 2006-09-27 11:02:13-07:00, malff@weblab.(none) +1 -10
    cleanup

  sql/lex_symbol.h@stripped, 2006-09-27 11:02:13-07:00, malff@weblab.(none) +0 -1
    cleanup

  sql/mysql_priv.h@stripped, 2006-09-27 15:34:03-07:00, malff@weblab.(none) +4 -0
    item_create init/cleanup

  sql/mysqld.cc@stripped, 2006-09-27 15:37:09-07:00, malff@weblab.(none) +2 -0
    item_create_init and cleanup

  sql/share/errmsg.txt@stripped, 2006-09-27 11:03:21-07:00, malff@weblab.(none) +4 -0
    new errors

  sql/sql_yacc.yy@stripped, 2006-09-27 11:02:13-07:00, malff@weblab.(none) +55 -79
    cleanup

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	malff
# Host:	weblab.(none)
# Root:	/home/marcsql/TREE/mysql-5.1-21114

--- 1.68/sql/item_create.cc	2006-09-27 15:39:23 -07:00
+++ 1.70/sql/item_create.cc	2006-09-27 15:39:23 -07:00
@@ -22,12 +22,15 @@
 #include "sp.h"
 
 // Helpers
+#ifndef HAVE_SPATIAL
 static int error_spatial_disabled()
 {
   // FIXME: error message can't be translated.
-  my_error(ER_FEATURE_DISABLED, MYF(0), "Spatial extentions", "HAVE_SPATIAL");
+  my_error(ER_FEATURE_DISABLED, MYF(0),
+           sym_group_geom.name, sym_group_geom.needed_define);
   return 1;
 }
+#endif
 
 int create_qfunc::create(
   THD *thd, LEX_STRING name,
@@ -197,8 +200,7 @@ int create_func_arg0::create(
   func= NULL;
   if (arg_count != 0)
   {
-    // FIXME : define a new error
-    my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+    my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
     error= 1;
   }
   else
@@ -223,8 +225,7 @@ int create_func_arg1::create(
   func= NULL;
   if (arg_count != 1)
   {
-    // FIXME : define a new error
-    my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+    my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
     error= 1;
   }
   else
@@ -250,8 +251,7 @@ int create_func_arg2::create(
   func= NULL;
   if (arg_count != 2)
   {
-    // FIXME : define a new error
-    my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+    my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
     error= 1;
   }
   else
@@ -279,8 +279,7 @@ int create_func_arg3::create(
   func= NULL;
   if (arg_count != 3)
   {
-    // FIXME : define a new error
-    my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+    my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
     error= 1;
   }
   else
@@ -378,15 +377,6 @@ int create_func_as_wkt::create(
 #endif
 }
 
-create_func_ascii create_func_ascii::s_singleton;
-
-int create_func_ascii::create(
-  THD *thd, Item *arg1, Item *& func)
-{
-  func= new Item_func_ascii(arg1);
-  return 0;
-}
-
 create_func_asin create_func_asin::s_singleton;
 
 int create_func_asin::create(
@@ -427,8 +417,7 @@ int create_func_atan::create(
     }
     default:
     {
-      // FIXME : define a new error
-      my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+      my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
       error= 1;
       break;
     }
@@ -451,7 +440,7 @@ int create_func_benchmark::create(
    */
   if ((arg1->type() != Item::INT_ITEM) || ! arg1->basic_const_item())
   {
-    my_error(ER_WRONG_USAGE, MYF(0), "BENCHMARK", "Count");
+    my_error(ER_WRONG_PARAMETERS_TO_BUILTIN_FCT, MYF(0), "BENCHMARK");
     func= NULL;
     error= 1;
   }
@@ -549,8 +538,7 @@ int create_func_concat::create(
   func= NULL;
   if (arg_count < 1)
   {
-    // FIXME : define a new error
-    my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+    my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
     error= 1;
   }
   else
@@ -580,8 +568,7 @@ int create_func_concat_ws::create(
   // while CONCAT accepts 1+
   if (arg_count < 2)
   {
-    // FIXME : define a new error
-    my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+    my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
     error= 1;
   }
   else
@@ -757,7 +744,7 @@ int create_func_decode::create(
    */
   if ((arg2->type() != Item::STRING_ITEM) || ! arg2->basic_const_item())
   {
-    my_error(ER_WRONG_USAGE, MYF(0), "DECODE", "Password");
+    my_error(ER_WRONG_PARAMETERS_TO_BUILTIN_FCT, MYF(0), "DECODE");
     func= NULL;
     error= 1;
   }
@@ -812,8 +799,7 @@ int create_func_des_decrypt::create(
     }
     default:
     {
-      // FIXME : define a new error
-      my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+      my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
       error= 1;
       break;
     }
@@ -853,8 +839,7 @@ int create_func_des_encrypt::create(
     }
     default:
     {
-      // FIXME : define a new error
-      my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+      my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
       error= 1;
       break;
     }
@@ -905,8 +890,7 @@ int create_func_elt::create(
   func= NULL;
   if (arg_count < 2)
   {
-    // FIXME : define a new error
-    my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+    my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
     error= 1;
   }
   else
@@ -932,7 +916,7 @@ int create_func_encode::create(
    */
   if ((arg2->type() != Item::STRING_ITEM) || ! arg2->basic_const_item())
   {
-    my_error(ER_WRONG_USAGE, MYF(0), "ENCODE", "Password");
+    my_error(ER_WRONG_PARAMETERS_TO_BUILTIN_FCT, MYF(0), "ENCODE");
     func= NULL;
     error= 1;
   }
@@ -979,8 +963,7 @@ int create_func_encrypt::create(
     }
     default:
     {
-      // FIXME : define a new error
-      my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+      my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
       error= 1;
       break;
     }
@@ -1082,8 +1065,7 @@ int create_func_export_set::create(
     }
     default:
     {
-      // FIXME : define a new error
-      my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+      my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
       error= 1;
       break;
     }
@@ -1121,8 +1103,7 @@ int create_func_field::create(
   func= NULL;
   if (arg_count < 2)
   {
-    // FIXME : define a new error
-    my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+    my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
     error= 1;
   }
   else
@@ -1166,7 +1147,7 @@ int create_func_format::create(
    */
   if ((arg2->type() != Item::INT_ITEM) || ! arg2->basic_const_item())
   {
-    my_error(ER_WRONG_USAGE, MYF(0), "FORMAT", "Decimal");
+    my_error(ER_WRONG_PARAMETERS_TO_BUILTIN_FCT, MYF(0), "FORMAT");
     func= NULL;
     error= 1;
   }
@@ -1229,8 +1210,7 @@ int create_func_from_unixtime::create(
     }
     default:
     {
-      // FIXME : define a new error
-      my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+      my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
       error= 1;
       break;
     }
@@ -1271,8 +1251,7 @@ int create_func_geometry_from_text::crea
     }
     default:
     {
-      // FIXME : define a new error
-      my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+      my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
       error= 1;
       break;
     }
@@ -1317,8 +1296,7 @@ int create_func_geometry_from_wkb::creat
     }
     default:
     {
-      // FIXME : define a new error
-      my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+      my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
       error= 1;
       break;
     }
@@ -1395,8 +1373,7 @@ int create_func_greatest::create(
   func= NULL;
   if (arg_count < 2)
   {
-    // FIXME : define a new error
-    my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+    my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
     error= 1;
   }
   else
@@ -1587,8 +1564,7 @@ int create_func_last_insert_id::create(
     }
     default:
     {
-      // FIXME : define a new error
-      my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+      my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
       error= 1;
       break;
     }
@@ -1621,8 +1597,7 @@ int create_func_least::create(
   func= NULL;
   if (arg_count < 2)
   {
-    // FIXME : define a new error
-    my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+    my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
     error= 1;
   }
   else
@@ -1697,8 +1672,7 @@ int create_func_locate::create(
     }
     default:
     {
-      // FIXME : define a new error
-      my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+      my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
       error= 1;
       break;
     }
@@ -1738,8 +1712,7 @@ int create_func_log::create(
     }
     default:
     {
-      // FIXME : define a new error
-      my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+      my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
       error= 1;
       break;
     }
@@ -1818,8 +1791,7 @@ int create_func_make_set::create(
   func= NULL;
   if (arg_count < 2)
   {
-    // FIXME : define a new error
-    my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+    my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
     error= 1;
   }
   else
@@ -1867,8 +1839,7 @@ int create_func_master_pos_wait::create(
     }
     default:
     {
-      // FIXME : define a new error
-      my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+      my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
       error= 1;
       break;
     }
@@ -1885,24 +1856,6 @@ int create_func_md5::create(
   return 0;
 }
 
-create_func_mod create_func_mod::s_singleton;
-
-int create_func_mod::create(
-  THD *thd, Item *arg1, Item *arg2, Item *& func)
-{
-  func= new Item_func_mod(arg1, arg2);
-  return 0;
-}
-
-create_func_month create_func_month::s_singleton;
-
-int create_func_month::create(
-  THD *thd, Item *arg1, Item *& func)
-{
-  func= new Item_func_month(arg1);
-  return 0;
-}
-
 create_func_monthname create_func_monthname::s_singleton;
 
 int create_func_monthname::create(
@@ -2029,19 +1982,6 @@ int create_func_pi::create(
   return 0;
 }
 
-create_func_point create_func_point::s_singleton;
-
-int create_func_point::create(
-  THD *thd, Item *arg1, Item *arg2, Item *& func)
-{
-#ifdef HAVE_SPATIAL
-  func= new Item_func_point(arg1, arg2);
-  return 0;
-#else
-  return error_spatial_disabled();
-#endif
-}
-
 create_func_pointn create_func_pointn::s_singleton;
 
 int create_func_pointn::create(
@@ -2113,8 +2053,7 @@ int create_func_rand::create(
     }
     default:
     {
-      // FIXME : define a new error
-      my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+      my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
       error= 1;
       break;
     }
@@ -2133,15 +2072,6 @@ int create_func_release_lock::create(
   return 0;
 }
 
-create_func_repeat create_func_repeat::s_singleton;
-
-int create_func_repeat::create(
-  THD *thd, Item *arg1, Item *arg2, Item *& func)
-{
-  func= new Item_func_repeat(arg1, arg2);
-  return 0;
-}
-
 create_func_reverse create_func_reverse::s_singleton;
 
 int create_func_reverse::create(
@@ -2183,8 +2113,7 @@ int create_func_round::create(
     }
     default:
     {
-      // FIXME : define a new error
-      my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+      my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
       error= 1;
       break;
     }
@@ -2495,8 +2424,7 @@ int create_func_unix_timestamp::create(
     }
     default:
     {
-      // FIXME : define a new error
-      my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+      my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
       error= 1;
       break;
     }
@@ -2607,15 +2535,6 @@ int create_func_y::create(
 #endif
 }
 
-create_func_year create_func_year::s_singleton;
-
-int create_func_year::create(
-  THD *thd, Item *arg1, Item *& func)
-{
-  func= new Item_func_year(arg1);
-  return 0;
-}
-
 create_func_year_week create_func_year_week::s_singleton;
 
 int create_func_year_week::create(
@@ -2648,8 +2567,7 @@ int create_func_year_week::create(
     }
     default:
     {
-      // FIXME : define a new error
-      my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), name.str);
+      my_error(ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT, MYF(0), name.str);
       error= 1;
       break;
     }
@@ -2660,261 +2578,309 @@ int create_func_year_week::create(
 
 struct sql_func_registry
 {
-  const char *name;
+  LEX_STRING name;
   create_func *builder;
 };
 
+/*
+   MySQL built-in functions.
+   MAINTAINER:
+   - Keep sorted for human lookup. At runtime, a hash table is used.
+   - do **NOT** use #ifdef / #ifndef for conditional entries:
+     doing so will cause user code that works against a --without-XYZ binary
+     to fail with name collisions against a --with-XYZ binary.
+ */
 static sql_func_registry func_array[] =
 {
-  { "ABS", & create_func_abs::s_singleton},
-  { "ACOS", & create_func_acos::s_singleton},
-  { "ADDTIME", & create_func_addtime::s_singleton},
-  { "AES_ENCRYPT", & create_func_aes_encrypt::s_singleton},
-  { "AES_DECRYPT", & create_func_aes_decrypt::s_singleton},
-  { "AREA", & create_func_area::s_singleton},
-  { "ASBINARY", & create_func_as_wkb::s_singleton},
-  { "ASTEXT", & create_func_as_wkt::s_singleton},
-  { "ASWKB", & create_func_as_wkb::s_singleton},
-  { "ASWKT", & create_func_as_wkt::s_singleton},
-  { "ASCII", & create_func_ascii::s_singleton},
-
-  { "ASIN", & create_func_asin::s_singleton},
-  { "ATAN", & create_func_atan::s_singleton},
-  { "ATAN2", & create_func_atan::s_singleton}, // ???
-  { "BENCHMARK", & create_func_benchmark::s_singleton},
-  { "BIN", & create_func_bin::s_singleton},
-  { "BIT_COUNT", & create_func_bit_count::s_singleton},
-  { "BIT_LENGTH", & create_func_bit_length::s_singleton},
-  { "CEIL", & create_func_ceiling::s_singleton},
-  { "CEILING", & create_func_ceiling::s_singleton},
-  { "CENTROID", & create_func_centroid::s_singleton},
-  { "CHAR_LENGTH", & create_func_char_length::s_singleton},
-  { "CHARACTER_LENGTH", & create_func_char_length::s_singleton},
-  { "COERCIBILITY", & create_func_coercibility::s_singleton},
-  { "CONCAT", & create_func_concat::s_singleton},
-  { "CONCAT_WS", & create_func_concat_ws::s_singleton},
-  { "COMPRESS", & create_func_compress::s_singleton},
-  { "CONNECTION_ID", & create_func_connection_id::s_singleton},
-  { "MBRCONTAINS", & create_func_contains::s_singleton},
-  { "CONV", & create_func_conv::s_singleton},
-  { "CONVERT_TZ", & create_func_convert_tz::s_singleton},
-  { "COS", & create_func_cos::s_singleton},
-  { "COT", & create_func_cot::s_singleton},
-  { "CRC32", & create_func_crc32::s_singleton},
-  { "CROSSES", & create_func_crosses::s_singleton},
-  { "DATE_FORMAT", & create_func_date_format::s_singleton},
-  { "DATEDIFF", & create_func_datediff::s_singleton},
-  { "DAYNAME", & create_func_dayname::s_singleton},
-  { "DAYOFMONTH", & create_func_dayofmonth::s_singleton},
-  { "DAYOFWEEK", & create_func_dayofweek::s_singleton},
-  { "DAYOFYEAR", & create_func_dayofyear::s_singleton},
-  { "DECODE", & create_func_decode::s_singleton},
-  { "DEGREES", & create_func_degrees::s_singleton},
-
-  { "DES_DECRYPT", & create_func_des_decrypt::s_singleton},
-  { "DES_ENCRYPT", & create_func_des_encrypt::s_singleton},
-  { "DIMENSION", & create_func_dimension::s_singleton},
-  { "DISJOINT", & create_func_disjoint::s_singleton},
-  { "ENDPOINT", & create_func_endpoint::s_singleton},
-  { "ENVELOPE", & create_func_envelope::s_singleton},
-  { "EQUALS", & create_func_equals::s_singleton},
-  { "EXP", & create_func_exp::s_singleton},
-  { "EXPORT_SET", & create_func_export_set::s_singleton},
-  { "EXTERIORRING", & create_func_exteriorring::s_singleton},
-  { "FIND_IN_SET", & create_func_find_in_set::s_singleton},
-  { "FLOOR", & create_func_floor::s_singleton},
-  { "FORMAT", & create_func_format::s_singleton},
-  { "FOUND_ROWS", & create_func_found_rows::s_singleton},
-  { "FROM_DAYS", & create_func_from_days::s_singleton},
-  { "FROM_UNIXTIME", & create_func_from_unixtime::s_singleton},
-
-  { "FIELD", & create_func_field::s_singleton},
-  { "ELT", & create_func_elt::s_singleton},
-  { "ENCODE", & create_func_encode::s_singleton},
-  { "ENCRYPT", & create_func_encrypt::s_singleton},
+  { C_STRING_WITH_LEN("ABS"), & create_func_abs::s_singleton},
+  { C_STRING_WITH_LEN("ACOS"), & create_func_acos::s_singleton},
+  { C_STRING_WITH_LEN("ADDTIME"), & create_func_addtime::s_singleton},
+  { C_STRING_WITH_LEN("AES_ENCRYPT"), & create_func_aes_encrypt::s_singleton},
+  { C_STRING_WITH_LEN("AES_DECRYPT"), & create_func_aes_decrypt::s_singleton},
+  { C_STRING_WITH_LEN("AREA"), & create_func_area::s_singleton},
+  { C_STRING_WITH_LEN("ASBINARY"), & create_func_as_wkb::s_singleton},
+  { C_STRING_WITH_LEN("ASTEXT"), & create_func_as_wkt::s_singleton},
+  { C_STRING_WITH_LEN("ASWKB"), & create_func_as_wkb::s_singleton},
+  { C_STRING_WITH_LEN("ASWKT"), & create_func_as_wkt::s_singleton},
+
+  { C_STRING_WITH_LEN("ASIN"), & create_func_asin::s_singleton},
+  { C_STRING_WITH_LEN("ATAN"), & create_func_atan::s_singleton},
+  { C_STRING_WITH_LEN("ATAN2"), & create_func_atan::s_singleton},
+  { C_STRING_WITH_LEN("BENCHMARK"), & create_func_benchmark::s_singleton},
+  { C_STRING_WITH_LEN("BIN"), & create_func_bin::s_singleton},
+  { C_STRING_WITH_LEN("BIT_COUNT"), & create_func_bit_count::s_singleton},
+  { C_STRING_WITH_LEN("BIT_LENGTH"), & create_func_bit_length::s_singleton},
+  { C_STRING_WITH_LEN("CEIL"), & create_func_ceiling::s_singleton},
+  { C_STRING_WITH_LEN("CEILING"), & create_func_ceiling::s_singleton},
+  { C_STRING_WITH_LEN("CENTROID"), & create_func_centroid::s_singleton},
+  { C_STRING_WITH_LEN("CHAR_LENGTH"), & create_func_char_length::s_singleton},
+  { C_STRING_WITH_LEN("CHARACTER_LENGTH"), & create_func_char_length::s_singleton},
+  { C_STRING_WITH_LEN("COERCIBILITY"), & create_func_coercibility::s_singleton},
+  { C_STRING_WITH_LEN("CONCAT"), & create_func_concat::s_singleton},
+  { C_STRING_WITH_LEN("CONCAT_WS"), & create_func_concat_ws::s_singleton},
+  { C_STRING_WITH_LEN("COMPRESS"), & create_func_compress::s_singleton},
+  { C_STRING_WITH_LEN("CONNECTION_ID"), & create_func_connection_id::s_singleton},
+  { C_STRING_WITH_LEN("MBRCONTAINS"), & create_func_contains::s_singleton},
+  { C_STRING_WITH_LEN("CONV"), & create_func_conv::s_singleton},
+  { C_STRING_WITH_LEN("CONVERT_TZ"), & create_func_convert_tz::s_singleton},
+  { C_STRING_WITH_LEN("COS"), & create_func_cos::s_singleton},
+  { C_STRING_WITH_LEN("COT"), & create_func_cot::s_singleton},
+  { C_STRING_WITH_LEN("CRC32"), & create_func_crc32::s_singleton},
+  { C_STRING_WITH_LEN("CROSSES"), & create_func_crosses::s_singleton},
+  { C_STRING_WITH_LEN("DATE_FORMAT"), & create_func_date_format::s_singleton},
+  { C_STRING_WITH_LEN("DATEDIFF"), & create_func_datediff::s_singleton},
+  { C_STRING_WITH_LEN("DAYNAME"), & create_func_dayname::s_singleton},
+  { C_STRING_WITH_LEN("DAYOFMONTH"), & create_func_dayofmonth::s_singleton},
+  { C_STRING_WITH_LEN("DAYOFWEEK"), & create_func_dayofweek::s_singleton},
+  { C_STRING_WITH_LEN("DAYOFYEAR"), & create_func_dayofyear::s_singleton},
+  { C_STRING_WITH_LEN("DECODE"), & create_func_decode::s_singleton},
+  { C_STRING_WITH_LEN("DEGREES"), & create_func_degrees::s_singleton},
+
+  { C_STRING_WITH_LEN("DES_DECRYPT"), & create_func_des_decrypt::s_singleton},
+  { C_STRING_WITH_LEN("DES_ENCRYPT"), & create_func_des_encrypt::s_singleton},
+  { C_STRING_WITH_LEN("DIMENSION"), & create_func_dimension::s_singleton},
+  { C_STRING_WITH_LEN("DISJOINT"), & create_func_disjoint::s_singleton},
+  { C_STRING_WITH_LEN("ENDPOINT"), & create_func_endpoint::s_singleton},
+  { C_STRING_WITH_LEN("ENVELOPE"), & create_func_envelope::s_singleton},
+  { C_STRING_WITH_LEN("EQUALS"), & create_func_equals::s_singleton},
+  { C_STRING_WITH_LEN("EXP"), & create_func_exp::s_singleton},
+  { C_STRING_WITH_LEN("EXPORT_SET"), & create_func_export_set::s_singleton},
+  { C_STRING_WITH_LEN("EXTERIORRING"), & create_func_exteriorring::s_singleton},
+  { C_STRING_WITH_LEN("FIND_IN_SET"), & create_func_find_in_set::s_singleton},
+  { C_STRING_WITH_LEN("FLOOR"), & create_func_floor::s_singleton},
+  { C_STRING_WITH_LEN("FORMAT"), & create_func_format::s_singleton},
+  { C_STRING_WITH_LEN("FOUND_ROWS"), & create_func_found_rows::s_singleton},
+  { C_STRING_WITH_LEN("FROM_DAYS"), & create_func_from_days::s_singleton},
+  { C_STRING_WITH_LEN("FROM_UNIXTIME"), & create_func_from_unixtime::s_singleton},
+
+  { C_STRING_WITH_LEN("FIELD"), & create_func_field::s_singleton},
+  { C_STRING_WITH_LEN("ELT"), & create_func_elt::s_singleton},
+  { C_STRING_WITH_LEN("ENCODE"), & create_func_encode::s_singleton},
+  { C_STRING_WITH_LEN("ENCRYPT"), & create_func_encrypt::s_singleton},
 
   // FIXME: lots of aliases
-  { "POINTFROMTEXT", & create_func_geometry_from_text::s_singleton},
-  { "GEOMFROMTEXT", & create_func_geometry_from_text::s_singleton},
-  { "GEOMETRYFROMTEXT", & create_func_geometry_from_text::s_singleton},
-  { "MLINEFROMTEXT", & create_func_geometry_from_text::s_singleton},
-  { "MULTILINESTRINGFROMTEXT", & create_func_geometry_from_text::s_singleton},
-  { "MPOINTFROMTEXT", & create_func_geometry_from_text::s_singleton},
-  { "MULTIPOINTFROMTEXT", & create_func_geometry_from_text::s_singleton},
-  { "MPOLYFROMTEXT", & create_func_geometry_from_text::s_singleton},
-  { "MULTIPOLYGONFROMTEXT", & create_func_geometry_from_text::s_singleton},
-  { "POLYFROMTEXT", & create_func_geometry_from_text::s_singleton},
-  { "POLYGONFROMTEXT", & create_func_geometry_from_text::s_singleton},
-  { "GEOMCOLLFROMTEXT", & create_func_geometry_from_text::s_singleton},
-  { "GEOMETRYCOLLECTIONFROMTEXT", & create_func_geometry_from_text::s_singleton},
-  { "LINEFROMTEXT", & create_func_geometry_from_text::s_singleton},
-  { "LINESTRINGFROMTEXT", & create_func_geometry_from_text::s_singleton},
+  { C_STRING_WITH_LEN("POINTFROMTEXT"), & create_func_geometry_from_text::s_singleton},
+  { C_STRING_WITH_LEN("GEOMFROMTEXT"), & create_func_geometry_from_text::s_singleton},
+  { C_STRING_WITH_LEN("GEOMETRYFROMTEXT"), & create_func_geometry_from_text::s_singleton},
+  { C_STRING_WITH_LEN("MLINEFROMTEXT"), & create_func_geometry_from_text::s_singleton},
+  { C_STRING_WITH_LEN("MULTILINESTRINGFROMTEXT"), & create_func_geometry_from_text::s_singleton},
+  { C_STRING_WITH_LEN("MPOINTFROMTEXT"), & create_func_geometry_from_text::s_singleton},
+  { C_STRING_WITH_LEN("MULTIPOINTFROMTEXT"), & create_func_geometry_from_text::s_singleton},
+  { C_STRING_WITH_LEN("MPOLYFROMTEXT"), & create_func_geometry_from_text::s_singleton},
+  { C_STRING_WITH_LEN("MULTIPOLYGONFROMTEXT"), & create_func_geometry_from_text::s_singleton},
+  { C_STRING_WITH_LEN("POLYFROMTEXT"), & create_func_geometry_from_text::s_singleton},
+  { C_STRING_WITH_LEN("POLYGONFROMTEXT"), & create_func_geometry_from_text::s_singleton},
+  { C_STRING_WITH_LEN("GEOMCOLLFROMTEXT"), & create_func_geometry_from_text::s_singleton},
+  { C_STRING_WITH_LEN("GEOMETRYCOLLECTIONFROMTEXT"), & create_func_geometry_from_text::s_singleton},
+  { C_STRING_WITH_LEN("LINEFROMTEXT"), & create_func_geometry_from_text::s_singleton},
+  { C_STRING_WITH_LEN("LINESTRINGFROMTEXT"), & create_func_geometry_from_text::s_singleton},
 
   // FIXME: lots of aliases
-  { "GEOMCOLLFROMWKB", & create_func_geometry_from_wkb::s_singleton},
-  { "GEOMETRYCOLLECTIONFROMWKB", & create_func_geometry_from_wkb::s_singleton},
-  { "GEOMETRYFROMWKB", & create_func_geometry_from_wkb::s_singleton},
-  { "GEOMFROMWKB", & create_func_geometry_from_wkb::s_singleton},
-  { "LINEFROMWKB", & create_func_geometry_from_wkb::s_singleton},
-  { "LINESTRINGFROMWKB", & create_func_geometry_from_wkb::s_singleton},
-  { "MLINEFROMWKB", & create_func_geometry_from_wkb::s_singleton},
-  { "MPOINTFROMWKB", & create_func_geometry_from_wkb::s_singleton},
-  { "MPOLYFROMWKB", & create_func_geometry_from_wkb::s_singleton},
-  { "MULTILINESTRINGFROMWKB", & create_func_geometry_from_wkb::s_singleton},
-  { "MULTIPOINTFROMWKB", & create_func_geometry_from_wkb::s_singleton},
-  { "MULTIPOLYGONFROMWKB", & create_func_geometry_from_wkb::s_singleton},
-  { "POINTFROMWKB", & create_func_geometry_from_wkb::s_singleton},
-  { "POLYFROMWKB", & create_func_geometry_from_wkb::s_singleton},
-  { "POLYGONFROMWKB", & create_func_geometry_from_wkb::s_singleton},
-
-  { "GEOMETRYTYPE", & create_func_geometry_type::s_singleton},
-  { "GEOMETRYN", & create_func_geometryn::s_singleton},
-  { "GET_LOCK", & create_func_get_lock::s_singleton},
-  { "GLENGTH", & create_func_glength::s_singleton},
-  { "GREATEST", & create_func_greatest::s_singleton},
-  { "HEX", & create_func_hex::s_singleton},
-  { "IFNULL", & create_func_ifnull::s_singleton},
-  { "INET_NTOA", & create_func_inet_ntoa::s_singleton},
-  { "INET_ATON", & create_func_inet_aton::s_singleton},
-  { "INSTR", & create_func_instr::s_singleton},
-  { "INTERIORRINGN", & create_func_interiorringn::s_singleton},
-  { "INTERSECTS", & create_func_intersects::s_singleton},
-  { "IS_FREE_LOCK", & create_func_is_free_lock::s_singleton},
-  { "IS_USED_LOCK", & create_func_is_used_lock::s_singleton},
-  { "ISCLOSED", & create_func_isclosed::s_singleton},
-  { "ISEMPTY", & create_func_isempty::s_singleton},
-  { "ISNULL", & create_func_isnull::s_singleton},
-  { "ISSIMPLE", & create_func_issimple::s_singleton},
-  { "LAST_DAY", & create_func_last_day::s_singleton},
-  { "LAST_INSERT_ID", & create_func_last_insert_id::s_singleton},
-  { "LCASE", & create_func_lcase::s_singleton},
-  { "LOWER", & create_func_lcase::s_singleton},
-
-  { "LEAST", & create_func_least::s_singleton},
-  { "LENGTH", & create_func_length::s_singleton},
-  { "OCTET_LENGTH", & create_func_length::s_singleton},
-
-  { "LN", & create_func_ln::s_singleton},
-  { "LOAD_FILE", & create_func_load_file::s_singleton},
-  { "LOCATE", & create_func_locate::s_singleton},
-  { "LOG", & create_func_log::s_singleton},
-  { "LOG10", & create_func_log10::s_singleton},
-  { "LOG2", & create_func_log2::s_singleton},
-  { "LPAD", & create_func_lpad::s_singleton},
-  { "LTRIM", & create_func_ltrim::s_singleton},
-  { "MAKEDATE", & create_func_makedate::s_singleton},
-  { "MAKETIME", & create_func_maketime::s_singleton},
-  { "MAKE_SET", & create_func_make_set::s_singleton},
-  { "MD5", & create_func_md5::s_singleton},
-  { "MASTER_POS_WAIT", & create_func_master_pos_wait::s_singleton},
-
-  // { "XXX", & create_func_mod::s_singleton},
-  // { "XXX", & create_func_month::s_singleton},
-
-  { "MONTHNAME", & create_func_monthname::s_singleton},
-  { "NAME_CONST", & create_func_name_const::s_singleton},
-  { "NULLIF", & create_func_nullif::s_singleton},
-  { "NUMGEOMETRIES", & create_func_numgeometries::s_singleton},
-  { "NUMINTERIORRINGS", & create_func_numinteriorring::s_singleton},
-  { "NUMPOINTS", & create_func_numpoints::s_singleton},
-  { "OCT", & create_func_oct::s_singleton},
-  { "ORD", & create_func_ord::s_singleton},
-  { "OVERLAPS", & create_func_overlaps::s_singleton},
-  { "PERIOD_ADD", & create_func_period_add::s_singleton},
-  { "PERIOD_DIFF", & create_func_period_diff::s_singleton},
-  { "PI", & create_func_pi::s_singleton},
-
-  { "POINT", & create_func_point::s_singleton}, // REVIEW THIS
-
-  { "POINTN", & create_func_pointn::s_singleton},
-  { "POW", & create_func_pow::s_singleton},
-  { "POWER", & create_func_pow::s_singleton},
-  { "QUOTE", & create_func_quote::s_singleton},
-  { "RADIANS", & create_func_radians::s_singleton},
-  { "RAND", & create_func_rand::s_singleton},
-  { "RELEASE_LOCK", & create_func_release_lock::s_singleton},
-
-  // { "XXX", & create_func_repeat::s_singleton},
-
-  { "REVERSE", & create_func_reverse::s_singleton},
-  { "ROUND", & create_func_round::s_singleton},
-  { "ROW_COUNT", & create_func_row_count::s_singleton},
-  { "RPAD", & create_func_rpad::s_singleton},
-  { "RTRIM", & create_func_rtrim::s_singleton},
-  { "SEC_TO_TIME", & create_func_sec_to_time::s_singleton},
-  { "SHA", & create_func_sha::s_singleton},
-  { "SHA1", & create_func_sha::s_singleton},
-  { "SIGN", & create_func_sign::s_singleton},
-  { "SIN", & create_func_sin::s_singleton},
-  { "SLEEP", & create_func_sleep::s_singleton},
-  { "SPACE", & create_func_space::s_singleton},
-  { "SOUNDEX", & create_func_soundex::s_singleton},
-  { "SQRT", & create_func_sqrt::s_singleton},
-  { "SRID", & create_func_srid::s_singleton},
-
-  { "STARTPOINT", & create_func_startpoint::s_singleton},
-  { "STR_TO_DATE", & create_func_str_to_date::s_singleton},
-  { "SUBSTRING_INDEX", & create_func_substr_index::s_singleton},
-  { "STRCMP", & create_func_strcmp::s_singleton},
-  { "SUBTIME", & create_func_subtime::s_singleton},
-  { "TAN", & create_func_tan::s_singleton},
-  { "TIME_FORMAT", & create_func_time_format::s_singleton},
-  { "TIME_TO_SEC", & create_func_time_to_sec::s_singleton},
-  { "TIMEDIFF", & create_func_timediff::s_singleton},
-  { "TO_DAYS", & create_func_to_days::s_singleton},
-  { "TOUCHES", & create_func_touches::s_singleton},
-  { "UCASE", & create_func_ucase::s_singleton},
-  { "UPPER", & create_func_ucase::s_singleton},
-
-  { "UNCOMPRESS", & create_func_uncompress::s_singleton},
-  { "UNCOMPRESSED_LENGTH", & create_func_uncompressed_length::s_singleton},
-  { "UNHEX", & create_func_unhex::s_singleton},
-  { "UUID", & create_func_uuid::s_singleton},
-  { "UNIX_TIMESTAMP", & create_func_unix_timestamp::s_singleton},
-  { "VERSION", & create_func_version::s_singleton},
-  { "WEEKDAY", & create_func_weekday::s_singleton},
-  { "WEEKOFYEAR", & create_func_weekofyear::s_singleton},
-  { "WITHIN", & create_func_within::s_singleton},
-  { "X", & create_func_x::s_singleton},
-  { "EXTRACTVALUE", & create_func_xml_extractvalue::s_singleton},
-  { "UPDATEXML", & create_func_xml_update::s_singleton},
-  { "Y", & create_func_y::s_singleton},
-
-  // { "FIXME", & create_func_year::s_singleton},
-  { "YEARWEEK", & create_func_year_week::s_singleton},
+  { C_STRING_WITH_LEN("GEOMCOLLFROMWKB"), & create_func_geometry_from_wkb::s_singleton},
+  { C_STRING_WITH_LEN("GEOMETRYCOLLECTIONFROMWKB"), & create_func_geometry_from_wkb::s_singleton},
+  { C_STRING_WITH_LEN("GEOMETRYFROMWKB"), & create_func_geometry_from_wkb::s_singleton},
+  { C_STRING_WITH_LEN("GEOMFROMWKB"), & create_func_geometry_from_wkb::s_singleton},
+  { C_STRING_WITH_LEN("LINEFROMWKB"), & create_func_geometry_from_wkb::s_singleton},
+  { C_STRING_WITH_LEN("LINESTRINGFROMWKB"), & create_func_geometry_from_wkb::s_singleton},
+  { C_STRING_WITH_LEN("MLINEFROMWKB"), & create_func_geometry_from_wkb::s_singleton},
+  { C_STRING_WITH_LEN("MPOINTFROMWKB"), & create_func_geometry_from_wkb::s_singleton},
+  { C_STRING_WITH_LEN("MPOLYFROMWKB"), & create_func_geometry_from_wkb::s_singleton},
+  { C_STRING_WITH_LEN("MULTILINESTRINGFROMWKB"), & create_func_geometry_from_wkb::s_singleton},
+  { C_STRING_WITH_LEN("MULTIPOINTFROMWKB"), & create_func_geometry_from_wkb::s_singleton},
+  { C_STRING_WITH_LEN("MULTIPOLYGONFROMWKB"), & create_func_geometry_from_wkb::s_singleton},
+  { C_STRING_WITH_LEN("POINTFROMWKB"), & create_func_geometry_from_wkb::s_singleton},
+  { C_STRING_WITH_LEN("POLYFROMWKB"), & create_func_geometry_from_wkb::s_singleton},
+  { C_STRING_WITH_LEN("POLYGONFROMWKB"), & create_func_geometry_from_wkb::s_singleton},
+
+  { C_STRING_WITH_LEN("GEOMETRYTYPE"), & create_func_geometry_type::s_singleton},
+  { C_STRING_WITH_LEN("GEOMETRYN"), & create_func_geometryn::s_singleton},
+  { C_STRING_WITH_LEN("GET_LOCK"), & create_func_get_lock::s_singleton},
+  { C_STRING_WITH_LEN("GLENGTH"), & create_func_glength::s_singleton},
+  { C_STRING_WITH_LEN("GREATEST"), & create_func_greatest::s_singleton},
+  { C_STRING_WITH_LEN("HEX"), & create_func_hex::s_singleton},
+  { C_STRING_WITH_LEN("IFNULL"), & create_func_ifnull::s_singleton},
+  { C_STRING_WITH_LEN("INET_NTOA"), & create_func_inet_ntoa::s_singleton},
+  { C_STRING_WITH_LEN("INET_ATON"), & create_func_inet_aton::s_singleton},
+  { C_STRING_WITH_LEN("INSTR"), & create_func_instr::s_singleton},
+  { C_STRING_WITH_LEN("INTERIORRINGN"), & create_func_interiorringn::s_singleton},
+  { C_STRING_WITH_LEN("INTERSECTS"), & create_func_intersects::s_singleton},
+  { C_STRING_WITH_LEN("IS_FREE_LOCK"), & create_func_is_free_lock::s_singleton},
+  { C_STRING_WITH_LEN("IS_USED_LOCK"), & create_func_is_used_lock::s_singleton},
+  { C_STRING_WITH_LEN("ISCLOSED"), & create_func_isclosed::s_singleton},
+  { C_STRING_WITH_LEN("ISEMPTY"), & create_func_isempty::s_singleton},
+  { C_STRING_WITH_LEN("ISNULL"), & create_func_isnull::s_singleton},
+  { C_STRING_WITH_LEN("ISSIMPLE"), & create_func_issimple::s_singleton},
+  { C_STRING_WITH_LEN("LAST_DAY"), & create_func_last_day::s_singleton},
+  { C_STRING_WITH_LEN("LAST_INSERT_ID"), & create_func_last_insert_id::s_singleton},
+  { C_STRING_WITH_LEN("LCASE"), & create_func_lcase::s_singleton},
+  { C_STRING_WITH_LEN("LOWER"), & create_func_lcase::s_singleton},
+
+  { C_STRING_WITH_LEN("LEAST"), & create_func_least::s_singleton},
+  { C_STRING_WITH_LEN("LENGTH"), & create_func_length::s_singleton},
+  { C_STRING_WITH_LEN("OCTET_LENGTH"), & create_func_length::s_singleton},
+
+  { C_STRING_WITH_LEN("LN"), & create_func_ln::s_singleton},
+  { C_STRING_WITH_LEN("LOAD_FILE"), & create_func_load_file::s_singleton},
+  { C_STRING_WITH_LEN("LOCATE"), & create_func_locate::s_singleton},
+  { C_STRING_WITH_LEN("LOG"), & create_func_log::s_singleton},
+  { C_STRING_WITH_LEN("LOG10"), & create_func_log10::s_singleton},
+  { C_STRING_WITH_LEN("LOG2"), & create_func_log2::s_singleton},
+  { C_STRING_WITH_LEN("LPAD"), & create_func_lpad::s_singleton},
+  { C_STRING_WITH_LEN("LTRIM"), & create_func_ltrim::s_singleton},
+  { C_STRING_WITH_LEN("MAKEDATE"), & create_func_makedate::s_singleton},
+  { C_STRING_WITH_LEN("MAKETIME"), & create_func_maketime::s_singleton},
+  { C_STRING_WITH_LEN("MAKE_SET"), & create_func_make_set::s_singleton},
+  { C_STRING_WITH_LEN("MD5"), & create_func_md5::s_singleton},
+  { C_STRING_WITH_LEN("MASTER_POS_WAIT"), & create_func_master_pos_wait::s_singleton},
+  { C_STRING_WITH_LEN("MONTHNAME"), & create_func_monthname::s_singleton},
+  { C_STRING_WITH_LEN("NAME_CONST"), & create_func_name_const::s_singleton},
+  { C_STRING_WITH_LEN("NULLIF"), & create_func_nullif::s_singleton},
+  { C_STRING_WITH_LEN("NUMGEOMETRIES"), & create_func_numgeometries::s_singleton},
+  { C_STRING_WITH_LEN("NUMINTERIORRINGS"), & create_func_numinteriorring::s_singleton},
+  { C_STRING_WITH_LEN("NUMPOINTS"), & create_func_numpoints::s_singleton},
+  { C_STRING_WITH_LEN("OCT"), & create_func_oct::s_singleton},
+  { C_STRING_WITH_LEN("ORD"), & create_func_ord::s_singleton},
+  { C_STRING_WITH_LEN("OVERLAPS"), & create_func_overlaps::s_singleton},
+  { C_STRING_WITH_LEN("PERIOD_ADD"), & create_func_period_add::s_singleton},
+  { C_STRING_WITH_LEN("PERIOD_DIFF"), & create_func_period_diff::s_singleton},
+  { C_STRING_WITH_LEN("PI"), & create_func_pi::s_singleton},
+  { C_STRING_WITH_LEN("POINTN"), & create_func_pointn::s_singleton},
+  { C_STRING_WITH_LEN("POW"), & create_func_pow::s_singleton},
+  { C_STRING_WITH_LEN("POWER"), & create_func_pow::s_singleton},
+  { C_STRING_WITH_LEN("QUOTE"), & create_func_quote::s_singleton},
+  { C_STRING_WITH_LEN("RADIANS"), & create_func_radians::s_singleton},
+  { C_STRING_WITH_LEN("RAND"), & create_func_rand::s_singleton},
+  { C_STRING_WITH_LEN("RELEASE_LOCK"), & create_func_release_lock::s_singleton},
+  { C_STRING_WITH_LEN("REVERSE"), & create_func_reverse::s_singleton},
+  { C_STRING_WITH_LEN("ROUND"), & create_func_round::s_singleton},
+  { C_STRING_WITH_LEN("ROW_COUNT"), & create_func_row_count::s_singleton},
+  { C_STRING_WITH_LEN("RPAD"), & create_func_rpad::s_singleton},
+  { C_STRING_WITH_LEN("RTRIM"), & create_func_rtrim::s_singleton},
+  { C_STRING_WITH_LEN("SEC_TO_TIME"), & create_func_sec_to_time::s_singleton},
+  { C_STRING_WITH_LEN("SHA"), & create_func_sha::s_singleton},
+  { C_STRING_WITH_LEN("SHA1"), & create_func_sha::s_singleton},
+  { C_STRING_WITH_LEN("SIGN"), & create_func_sign::s_singleton},
+  { C_STRING_WITH_LEN("SIN"), & create_func_sin::s_singleton},
+  { C_STRING_WITH_LEN("SLEEP"), & create_func_sleep::s_singleton},
+  { C_STRING_WITH_LEN("SPACE"), & create_func_space::s_singleton},
+  { C_STRING_WITH_LEN("SOUNDEX"), & create_func_soundex::s_singleton},
+  { C_STRING_WITH_LEN("SQRT"), & create_func_sqrt::s_singleton},
+  { C_STRING_WITH_LEN("SRID"), & create_func_srid::s_singleton},
+
+  { C_STRING_WITH_LEN("STARTPOINT"), & create_func_startpoint::s_singleton},
+  { C_STRING_WITH_LEN("STR_TO_DATE"), & create_func_str_to_date::s_singleton},
+  { C_STRING_WITH_LEN("SUBSTRING_INDEX"), & create_func_substr_index::s_singleton},
+  { C_STRING_WITH_LEN("STRCMP"), & create_func_strcmp::s_singleton},
+  { C_STRING_WITH_LEN("SUBTIME"), & create_func_subtime::s_singleton},
+  { C_STRING_WITH_LEN("TAN"), & create_func_tan::s_singleton},
+  { C_STRING_WITH_LEN("TIME_FORMAT"), & create_func_time_format::s_singleton},
+  { C_STRING_WITH_LEN("TIME_TO_SEC"), & create_func_time_to_sec::s_singleton},
+  { C_STRING_WITH_LEN("TIMEDIFF"), & create_func_timediff::s_singleton},
+  { C_STRING_WITH_LEN("TO_DAYS"), & create_func_to_days::s_singleton},
+  { C_STRING_WITH_LEN("TOUCHES"), & create_func_touches::s_singleton},
+  { C_STRING_WITH_LEN("UCASE"), & create_func_ucase::s_singleton},
+  { C_STRING_WITH_LEN("UPPER"), & create_func_ucase::s_singleton},
+
+  { C_STRING_WITH_LEN("UNCOMPRESS"), & create_func_uncompress::s_singleton},
+  { C_STRING_WITH_LEN("UNCOMPRESSED_LENGTH"), & create_func_uncompressed_length::s_singleton},
+  { C_STRING_WITH_LEN("UNHEX"), & create_func_unhex::s_singleton},
+  { C_STRING_WITH_LEN("UUID"), & create_func_uuid::s_singleton},
+  { C_STRING_WITH_LEN("UNIX_TIMESTAMP"), & create_func_unix_timestamp::s_singleton},
+  { C_STRING_WITH_LEN("VERSION"), & create_func_version::s_singleton},
+  { C_STRING_WITH_LEN("WEEKDAY"), & create_func_weekday::s_singleton},
+  { C_STRING_WITH_LEN("WEEKOFYEAR"), & create_func_weekofyear::s_singleton},
+  { C_STRING_WITH_LEN("WITHIN"), & create_func_within::s_singleton},
+  { C_STRING_WITH_LEN("X"), & create_func_x::s_singleton},
+  { C_STRING_WITH_LEN("EXTRACTVALUE"), & create_func_xml_extractvalue::s_singleton},
+  { C_STRING_WITH_LEN("UPDATEXML"), & create_func_xml_update::s_singleton},
+  { C_STRING_WITH_LEN("Y"), & create_func_y::s_singleton},
+  { C_STRING_WITH_LEN("YEARWEEK"), & create_func_year_week::s_singleton},
 
-
-  { NULL, NULL}
+  { {0, 0}, NULL}
 };
 
-create_func * find_sql_function_builder(THD *thd, LEX_STRING name)
+/*
+ Hash size 509:
+ - is prime number,
+ - big enought to ensure a low load factor for approx 200 built-in functions.
+ There is only 1 instance of this hash table, and it's totally static.
+ */
+const int BUILTIN_FUNCTIONS_HASH_SIZE= 509;
+static HASH g_builtin_functions_hash;
+
+extern "C" byte*
+get_builtin_fct_hash_key(const byte *buff, uint *length, my_bool /* unused */)
+{
+  sql_func_registry *func= (sql_func_registry*) buff;
+  *length= func->name.length;
+  return (byte*) func->name.str;
+}
+
+/*
+   Load the hash table for builtin functions.
+   Note: this code is not thread safe, and is intended to be used at server
+   startup only (before going multi-threaded)
+ */
+void item_create_init()
 {
-  CHARSET_INFO *cs = system_charset_info;
   sql_func_registry * cursor;
 
-  // FIXME : brute force scanning for now, need a hash table
+  DBUG_ENTER("item_create_init");
+
+  (void) hash_init(
+    & g_builtin_functions_hash,
+    system_charset_info,
+    BUILTIN_FUNCTIONS_HASH_SIZE,
+    0,
+    0,
+    (hash_get_key) get_builtin_fct_hash_key,
+    NULL,                                       /* Nothing to free */
+    MYF(0));
+
   for (cursor= func_array; cursor->builder != NULL; cursor++)
   {
-    if (my_strcasecmp(cs, cursor->name, name.str) == 0)
-    {
-      return cursor->builder;
-    }
+    (void) my_hash_insert(& g_builtin_functions_hash, (byte*) cursor);
+  }
+
+#ifndef DBUG_OFF
+  for (uint i=0 ; i < g_builtin_functions_hash.records ; i++)
+  {
+    cursor= (sql_func_registry*) hash_element(& g_builtin_functions_hash, i);
+    DBUG_PRINT("info", ("builtin function %s, length %d",
+                        cursor->name.str, cursor->name.length));
   }
+#endif
 
-  return NULL;
+  DBUG_VOID_RETURN;
 }
 
-create_func * find_udf_function_builder(THD *thd, LEX_STRING name)
+/*
+   Empty the hash table for builtin functions.
+   Note: this code is not thread safe, and is intended to be used at server
+   shutdown only (after thread requests have been executed).
+ */
+void item_create_cleanup()
 {
+  DBUG_ENTER("item_create_cleanup");
+  hash_free(& g_builtin_functions_hash);
+  DBUG_VOID_RETURN;
+}
+
+create_func * find_sql_function_builder(THD *thd, LEX_STRING name)
+{
+  sql_func_registry *func;
   create_func *builder= NULL;
 
-#ifdef HAVE_DLOPEN
-  udf_func *udf= find_udf(name.str, name.length);
-  if (udf)
+  /* Thread safe */
+  func= (sql_func_registry*) hash_search(
+    & g_builtin_functions_hash,
+    (byte*) name.str,
+    name.length);
+
+  if (func)
   {
-    builder= & create_udf_func::s_singleton;
+    builder= func->builder;
   }
-#endif
 
   return builder;
 }

--- 1.46/sql/item_create.h	2006-09-27 15:39:23 -07:00
+++ 1.48/sql/item_create.h	2006-09-27 15:39:23 -07:00
@@ -47,7 +47,6 @@ protected:
 };
 
 extern create_func * find_sql_function_builder(THD *thd, LEX_STRING name);
-extern create_func * find_udf_function_builder(THD *thd, LEX_STRING name);
 extern create_qfunc * find_sp_function_builder(THD *thd);
 
 // PUBLIC Function builder interface, for UDF (User Defined Functions)
@@ -254,19 +253,6 @@ protected:
   virtual ~create_func_as_wkt() {}
 };
 
-class create_func_ascii : public create_func_arg1
-{
-public:
-  virtual int create(
-    THD *thd, Item *arg1, Item *& func);
-
-  static create_func_ascii s_singleton;
-
-protected:
-  create_func_ascii() {}
-  virtual ~create_func_ascii() {}
-};
-
 class create_func_asin : public create_func_arg1
 {
 public:
@@ -1398,32 +1384,6 @@ protected:
   virtual ~create_func_md5() {}
 };
 
-class create_func_mod : public create_func_arg2
-{
-public:
-  virtual int create(
-    THD *thd, Item *arg1, Item *arg2, Item *& func);
-
-  static create_func_mod s_singleton;
-
-protected:
-  create_func_mod() {}
-  virtual ~create_func_mod() {}
-};
-
-class create_func_month : public create_func_arg1
-{
-public:
-  virtual int create(
-    THD *thd, Item *arg1, Item *& func);
-
-  static create_func_month s_singleton;
-
-protected:
-  create_func_month() {}
-  virtual ~create_func_month() {}
-};
-
 class create_func_monthname : public create_func_arg1
 {
 public:
@@ -1580,19 +1540,6 @@ protected:
   virtual ~create_func_pi() {}
 };
 
-class create_func_point : public create_func_arg2
-{
-public:
-  virtual int create(
-    THD *thd, Item *arg1, Item *arg2, Item *& func);
-
-  static create_func_point s_singleton;
-
-protected:
-  create_func_point() {}
-  virtual ~create_func_point() {}
-};
-
 class create_func_pointn : public create_func_arg2
 {
 public:
@@ -1671,19 +1618,6 @@ protected:
   virtual ~create_func_release_lock() {}
 };
 
-class create_func_repeat : public create_func_arg2
-{
-public:
-  virtual int create(
-    THD *thd, Item *arg1, Item *arg2, Item *& func);
-
-  static create_func_repeat s_singleton;
-
-protected:
-  create_func_repeat() {}
-  virtual ~create_func_repeat() {}
-};
-
 class create_func_reverse : public create_func_arg1
 {
 public:
@@ -2189,19 +2123,6 @@ public:
 protected:
   create_func_y() {}
   virtual ~create_func_y() {}
-};
-
-class create_func_year : public create_func_arg1
-{
-public:
-  virtual int create(
-    THD *thd, Item *arg1, Item *& func);
-
-  static create_func_year s_singleton;
-
-protected:
-  create_func_year() {}
-  virtual ~create_func_year() {}
 };
 
 class create_func_year_week : public create_func

--- 1.164/sql/lex.h	2006-09-27 15:39:23 -07:00
+++ 1.165/sql/lex.h	2006-09-27 15:39:23 -07:00
@@ -30,16 +30,7 @@ SYM_GROUP sym_group_rtree= {"RTree keys"
 #define SYM_OR_NULL(A) A
 #endif
 
-#define SYM(A) SYM_OR_NULL(A),0,0,&sym_group_common
-#define F_SYM(A) SYM_OR_NULL(A)
-
-#define CREATE_FUNC(A) (void *)(SYM_OR_NULL(A)), &sym_group_common
-
-#ifdef HAVE_SPATIAL
-#define CREATE_FUNC_GEOM(A) (void *)(SYM_OR_NULL(A)), &sym_group_geom
-#else
-#define CREATE_FUNC_GEOM(A) 0, &sym_group_geom
-#endif
+#define SYM(A) SYM_OR_NULL(A),0,&sym_group_common
 
 /*
   Symbols are broken into separated arrays to allow field names with

--- 1.7/sql/lex_symbol.h	2006-09-27 15:39:23 -07:00
+++ 1.8/sql/lex_symbol.h	2006-09-27 15:39:23 -07:00
@@ -26,7 +26,6 @@ typedef struct st_symbol {
   const char *name;
   uint	tok;
   uint length;
-  void *create_func;
   struct st_sym_group *group;
 } SYMBOL;
 

--- 1.433/sql/mysql_priv.h	2006-09-27 15:39:23 -07:00
+++ 1.434/sql/mysql_priv.h	2006-09-27 15:39:23 -07:00
@@ -2034,5 +2034,9 @@ inline void kill_delayed_threads(void) {
 /* Used by handlers to store things in schema tables */
 bool schema_table_store_record(THD *thd, TABLE *table);
 
+/* sql/item_create.cc */
+void item_create_init();
+void item_create_cleanup();
+
 #endif /* MYSQL_SERVER */
 #endif /* MYSQL_CLIENT */

--- 1.581/sql/mysqld.cc	2006-09-27 15:39:23 -07:00
+++ 1.582/sql/mysqld.cc	2006-09-27 15:39:23 -07:00
@@ -1177,6 +1177,7 @@ void clean_up(bool print_message)
   hostname_cache_free();
   item_user_lock_free();
   lex_free();				/* Free some memory */
+  item_create_cleanup();
   set_var_free();
   free_charsets();
   (void) ha_panic(HA_PANIC_CLOSE);	/* close all tables and logs */
@@ -2686,6 +2687,7 @@ static int init_common_variables(const c
     return 1;
   init_client_errs();
   lex_init();
+  item_create_init();
   item_init();
   set_var_init();
   mysys_uses_curses=0;

--- 1.497/sql/sql_yacc.yy	2006-09-27 15:39:23 -07:00
+++ 1.498/sql/sql_yacc.yy	2006-09-27 15:39:23 -07:00
@@ -164,7 +164,7 @@ bool my_yyoverflow(short **a, YYSTYPE **
 */
 %token  END_OF_INPUT                  /* INTERNAL */
 
-%token  ABORT_SYM                     /* FUTUR-USE */
+%token  ABORT_SYM                     /* INTERNAL (used in lex) */
 %token  ACCESSIBLE_SYM
 %token  ACTION                        /* SQL-2003-N */
 %token  ADD                           /* SQL-2003-R */
@@ -184,7 +184,6 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  ASCII_SYM                     /* MYSQL-FUNC */
 %token  ASENSITIVE_SYM                /* FUTUR-USE */
 %token  AT_SYM                        /* SQL-2003-R */
-// %token  ATAN                          /* MYSQL-FUNC */
 %token  AUTHORS_SYM
 %token  AUTO_INC
 %token  AUTOEXTEND_SIZE_SYM
@@ -193,7 +192,6 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  BACKUP_SYM
 %token  BEFORE_SYM                    /* SQL-2003-N */
 %token  BEGIN_SYM                     /* SQL-2003-R */
-%token  BENCHMARK_SYM
 %token  BIGINT                        /* SQL-2003-R */
 %token  BINARY                        /* SQL-2003-R */
 %token  BINLOG_SYM
@@ -236,8 +234,6 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  COMPACT_SYM
 %token  COMPLETION_SYM
 %token  COMPRESSED_SYM
-// %token  CONCAT                        /* MYSQL-FUNC */
-// %token  CONCAT_WS                     /* MYSQL-FUNC */
 %token  CONCURRENT
 %token  CONDITION_SYM                 /* SQL-2003-N */
 %token  CONNECTION_SYM
@@ -247,7 +243,6 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  CONTINUE_SYM                  /* SQL-2003-R */
 %token  CONTRIBUTORS_SYM
 %token  CONVERT_SYM                   /* SQL-2003-N */
-// %token  CONVERT_TZ_SYM                /* MYSQL-FUNC */
 %token  COUNT_SYM                     /* SQL-2003-N */
 %token  CREATE                        /* SQL-2003-R */
 %token  CROSS                         /* SQL-2003-R */
@@ -273,7 +268,6 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  DECIMAL_NUM
 %token  DECIMAL_SYM                   /* SQL-2003-R */
 %token  DECLARE_SYM                   /* SQL-2003-R */
-%token  DECODE_SYM
 %token  DEFAULT                       /* SQL-2003-R */
 %token  DEFINER_SYM
 %token  DELAYED_SYM
@@ -281,8 +275,6 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  DELETE_SYM                    /* SQL-2003-R */
 %token  DESC                          /* SQL-2003-N */
 %token  DESCRIBE                      /* SQL-2003-R */
-// %token  DES_DECRYPT_SYM
-// %token  DES_ENCRYPT_SYM
 %token  DES_KEY_FILE
 %token  DETERMINISTIC_SYM             /* SQL-2003-R */
 %token  DIRECTORY_SYM
@@ -300,11 +292,8 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  DYNAMIC_SYM                   /* SQL-2003-R */
 %token  EACH_SYM                      /* SQL-2003-R */
 %token  ELSEIF_SYM
-// %token  ELT_FUNC                      /* MYSQL-FUNC */
 %token  ENABLE_SYM
 %token  ENCLOSED
-%token  ENCODE_SYM
-// %token  ENCRYPT
 %token  END                           /* SQL-2003-R */
 %token  ENDS_SYM
 %token  ENGINES_SYM
@@ -322,14 +311,12 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  EXISTS                        /* SQL-2003-R */
 %token  EXIT_SYM
 %token  EXPANSION_SYM
-// %token  EXPORT_SET                    /* MYSQL-FUNC */
 %token  EXTENDED_SYM
 %token  EXTENT_SIZE_SYM
 %token  EXTRACT_SYM                   /* SQL-2003-N */
 %token  FALSE_SYM                     /* SQL-2003-R */
 %token  FAST_SYM
 %token  FETCH_SYM                     /* SQL-2003-R */
-// %token  FIELD_FUNC                    /* MYSQL-FUNC */
 %token  FILE_SYM
 %token  FIRST_SYM                     /* SQL-2003-N */
 %token  FIXED_SYM
@@ -338,30 +325,20 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  FLUSH_SYM
 %token  FORCE_SYM
 %token  FOREIGN                       /* SQL-2003-R */
-%token  FORMAT_SYM                    /* MYSQL-FUNC */
 %token  FOR_SYM                       /* SQL-2003-R */
 %token  FOUND_SYM                     /* SQL-2003-R */
 %token  FRAC_SECOND_SYM
 %token  FROM
-// %token  FROM_UNIXTIME                 /* MYSQL-FUNC */
 %token  FULL                          /* SQL-2003-R */
 %token  FULLTEXT_SYM
 %token  FUNCTION_SYM                  /* SQL-2003-R */
-%token  FUNC_ARG0                     /* INTERNAL */
-%token  FUNC_ARG1                     /* INTERNAL */
-%token  FUNC_ARG2                     /* INTERNAL */
-%token  FUNC_ARG3                     /* INTERNAL */
 %token  GE
-// %token  GEOMCOLLFROMTEXT
 %token  GEOMETRYCOLLECTION
 %token  GEOMETRY_SYM
-// %token  GEOMFROMTEXT
-// %token  GEOMFROMWKB
 %token  GET_FORMAT                    /* MYSQL-FUNC */
 %token  GLOBAL_SYM                    /* SQL-2003-R */
 %token  GRANT                         /* SQL-2003-R */
 %token  GRANTS
-// %token  GREATEST_SYM
 %token  GROUP                         /* SQL-2003-R */
 %token  GROUP_CONCAT_SYM
 %token  GROUP_UNIQUE_USERS
@@ -409,11 +386,9 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  KEY_BLOCK_SIZE
 %token  KILL_SYM
 %token  LANGUAGE_SYM                  /* SQL-2003-R */
-// %token  LAST_INSERT_ID
 %token  LAST_SYM                      /* SQL-2003-N */
 %token  LE                            /* OPERATOR */
 %token  LEADING                       /* SQL-2003-R */
-// %token  LEAST_SYM
 %token  LEAVES
 %token  LEAVE_SYM
 %token  LEFT                          /* SQL-2003-R */
@@ -423,19 +398,16 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  LIKE                          /* SQL-2003-R */
 %token  LIMIT
 %token  LINEAR_SYM
-// %token  LINEFROMTEXT
 %token  LINES
 %token  LINESTRING
 %token  LIST_SYM
 %token  LOAD
 %token  LOCAL_SYM                     /* SQL-2003-R */
-// %token  LOCATE
 %token  LOCATOR_SYM                   /* SQL-2003-N */
 %token  LOCKS_SYM
 %token  LOCK_SYM
 %token  LOGFILE_SYM
 %token  LOGS_SYM
-// %token  LOG_SYM                       /* MYSQL-FUNC */
 %token  LONGBLOB
 %token  LONGTEXT
 %token  LONG_NUM
@@ -443,14 +415,12 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  LOOP_SYM
 %token  LOW_PRIORITY
 %token  LT                            /* OPERATOR */
-// %token  MAKE_SET_SYM                  /* MYSQL-FUNC */
 %token  MASTER_CONNECT_RETRY_SYM
 %token  MASTER_HOST_SYM
 %token  MASTER_LOG_FILE_SYM
 %token  MASTER_LOG_POS_SYM
 %token  MASTER_PASSWORD_SYM
 %token  MASTER_PORT_SYM
-// %token  MASTER_POS_WAIT
 %token  MASTER_SERVER_ID_SYM
 %token  MASTER_SSL_CAPATH_SYM
 %token  MASTER_SSL_CA_SYM
@@ -482,14 +452,11 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  MINUTE_SYM                    /* SQL-2003-R */
 %token  MIN_ROWS
 %token  MIN_SYM                       /* SQL-2003-N */
-// %token  MLINEFROMTEXT
 %token  MODE_SYM
 %token  MODIFIES_SYM                  /* SQL-2003-R */
 %token  MODIFY_SYM
 %token  MOD_SYM                       /* SQL-2003-N */
 %token  MONTH_SYM                     /* SQL-2003-R */
-// %token  MPOINTFROMTEXT
-// %token  MPOLYFROMTEXT
 %token  MULTILINESTRING
 %token  MULTIPOINT
 %token  MULTIPOLYGON
@@ -517,7 +484,6 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  NUMERIC_SYM                   /* SQL-2003-R */
 %token  NVARCHAR_SYM
 %token  OFFSET_SYM
-// %token  OJ_SYM
 %token  OLD_PASSWORD
 %token  ON                            /* SQL-2003-R */
 %token  ONE_SHOT_SYM
@@ -544,9 +510,7 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  PHASE_SYM
 %token  PLUGIN_SYM
 %token  PLUGINS_SYM
-// %token  POINTFROMTEXT
 %token  POINT_SYM
-// %token  POLYFROMTEXT
 %token  POLYGON
 %token  POSITION_SYM                  /* SQL-2003-N */
 %token  PRECISION                     /* SQL-2003-R */
@@ -562,7 +526,6 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  QUARTER_SYM
 %token  QUERY_SYM
 %token  QUICK
-%token  RAND                          /* MYSQL-FUNC */
 %token  RANGE_SYM                     /* SQL-2003-R */
 %token  READS_SYM                     /* SQL-2003-R */
 %token  READ_ONLY_SYM
@@ -601,10 +564,9 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  RIGHT                         /* SQL-2003-R */
 %token  ROLLBACK_SYM                  /* SQL-2003-R */
 %token  ROLLUP_SYM                    /* SQL-2003-R */
-// %token  ROUND                         /* MYSQL-FUNC */
 %token  ROUTINE_SYM                   /* SQL-2003-N */
 %token  ROWS_SYM                      /* SQL-2003-R */
-// %token  ROW_COUNT_SYM                 /* SQL-2003-N */
+/* ROW_COUNT_SYM : treated as a function. SQL-2003-N */
 %token  ROW_FORMAT_SYM
 %token  ROW_SYM                       /* SQL-2003-R */
 %token  RTREE_SYM
@@ -663,7 +625,6 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  SUBPARTITION_SYM
 %token  SUBPARTITIONS_SYM
 %token  SUBSTRING                     /* SQL-2003-N */
-// %token  SUBSTRING_INDEX               /* MYSQL-FUNC */
 %token  SUM_SYM                       /* SQL-2003-N */
 %token  SUPER_SYM
 %token  SUSPEND_SYM
@@ -707,7 +668,6 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  UNION_SYM                     /* SQL-2003-R */
 %token  UNIQUE_SYM
 %token  UNIQUE_USERS
-// %token  UNIX_TIMESTAMP
 %token  UNKNOWN_SYM                   /* SQL-2003-R */
 %token  UNLOCK_SYM
 %token  UNSIGNED
@@ -743,7 +703,6 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  X509_SYM
 %token  XA_SYM
 %token  XOR
-// %token  YEARWEEK
 %token  YEAR_MONTH_SYM
 %token  YEAR_SYM                      /* SQL-2003-R */
 %token  ZEROFILL
@@ -825,7 +784,7 @@ bool my_yyoverflow(short **a, YYSTYPE **
 	table_wild simple_expr udf_expr
 	expr_or_default set_expr_or_default interval_expr
 	param_marker singlerow_subselect singlerow_subselect_init
-	exists_subselect exists_subselect_init
+	exists_subselect exists_subselect_init geometry_function
 	signed_literal now_or_signed_literal opt_escape
 	sp_opt_default
 	simple_ident_nospvar simple_ident_q
@@ -6178,8 +6137,6 @@ simple_expr:
             }
             $$= new Item_func_interval((Item_row *)$1);
           }
-	| MOD_SYM '(' expr ',' expr ')'
-	  { $$ = new Item_func_mod( $3, $5); }
 	| UNIQUE_USERS '(' text_literal ',' NUM ',' NUM ',' expr_list ')'
 	  {
             $$= new Item_func_unique_users($3,atoi($5.str),atoi($7.str), * $9);
@@ -6323,31 +6280,15 @@ conflict_function_call:
 	  { $$= new Item_func_coalesce(* $3); }
 	| COLLATION_SYM '(' expr ')'
 	  { $$= new Item_func_collation($3); }
-	| CONTAINS_SYM '(' expr ',' expr ')'
-	  { $$= GEOM_NEW(Item_func_spatial_rel($3, $5, Item_func::SP_CONTAINS_FUNC)); }
 	| DATABASE '(' ')'
 	  {
 	    $$= new Item_func_database();
             Lex->safe_to_cache_query=0;
 	  }
-	| GEOMETRYCOLLECTION '(' expr_list ')'
-	  { $$= GEOM_NEW(Item_func_spatial_collection(* $3,
-                           Geometry::wkb_geometrycollection,
-                           Geometry::wkb_point)); }
-	| LINESTRING '(' expr_list ')'
-	  { $$= GEOM_NEW(Item_func_spatial_collection(* $3,
-                  Geometry::wkb_linestring, Geometry::wkb_point)); }
 	| MICROSECOND_SYM '(' expr ')'
 	  { $$= new Item_func_microsecond($3); }
- 	| MULTILINESTRING '(' expr_list ')'
-	  { $$= GEOM_NEW( Item_func_spatial_collection(* $3,
-                   Geometry::wkb_multilinestring, Geometry::wkb_linestring)); }
-	| MULTIPOINT '(' expr_list ')'
-	  { $$= GEOM_NEW(Item_func_spatial_collection(* $3,
-                  Geometry::wkb_multipoint, Geometry::wkb_point)); }
- 	| MULTIPOLYGON '(' expr_list ')'
-	  { $$= GEOM_NEW(Item_func_spatial_collection(* $3,
-                  Geometry::wkb_multipolygon, Geometry::wkb_polygon)); }
+	| MOD_SYM '(' expr ',' expr ')'
+	  { $$ = new Item_func_mod( $3, $5); }
 	| OLD_PASSWORD '(' expr ')'
 	  { $$=  new Item_func_old_password($3); }
 	| PASSWORD '(' expr ')'
@@ -6356,11 +6297,6 @@ conflict_function_call:
               (Item *) new Item_func_old_password($3) :
 	      (Item *) new Item_func_password($3);
 	  }
-	| POINT_SYM '(' expr ',' expr ')'
-	  { $$= GEOM_NEW(Item_func_point($3,$5)); }
-	| POLYGON '(' expr_list ')'
-	  { $$= GEOM_NEW(Item_func_spatial_collection(* $3,
-	          Geometry::wkb_polygon, Geometry::wkb_linestring)); }
 	| QUARTER_SYM '(' expr ')'
 	  { $$ = new Item_func_quarter($3); }
 	| REPEAT_SYM '(' expr ',' expr ')'
@@ -6376,6 +6312,42 @@ conflict_function_call:
           }
 	| WEEK_SYM '(' expr ',' expr ')'
 	  { $$= new Item_func_week($3,$5); }
+        | geometry_function
+          {
+#ifdef HAVE_SPATIAL
+            $$= $1;
+#else
+            my_error(ER_FEATURE_DISABLED, MYF(0),
+                     sym_group_geom.name, sym_group_geom.needed_define);
+            YYABORT;
+#endif
+          }
+        ;
+
+geometry_function:
+	  CONTAINS_SYM '(' expr ',' expr ')'
+	  { $$= GEOM_NEW(Item_func_spatial_rel($3, $5, Item_func::SP_CONTAINS_FUNC)); }
+	| GEOMETRYCOLLECTION '(' expr_list ')'
+	  { $$= GEOM_NEW(Item_func_spatial_collection(* $3,
+                           Geometry::wkb_geometrycollection,
+                           Geometry::wkb_point)); }
+	| LINESTRING '(' expr_list ')'
+	  { $$= GEOM_NEW(Item_func_spatial_collection(* $3,
+                  Geometry::wkb_linestring, Geometry::wkb_point)); }
+ 	| MULTILINESTRING '(' expr_list ')'
+	  { $$= GEOM_NEW( Item_func_spatial_collection(* $3,
+                   Geometry::wkb_multilinestring, Geometry::wkb_linestring)); }
+	| MULTIPOINT '(' expr_list ')'
+	  { $$= GEOM_NEW(Item_func_spatial_collection(* $3,
+                  Geometry::wkb_multipoint, Geometry::wkb_point)); }
+ 	| MULTIPOLYGON '(' expr_list ')'
+	  { $$= GEOM_NEW(Item_func_spatial_collection(* $3,
+                  Geometry::wkb_multipolygon, Geometry::wkb_polygon)); }
+	| POINT_SYM '(' expr ',' expr ')'
+	  { $$= GEOM_NEW(Item_func_point($3,$5)); }
+	| POLYGON '(' expr_list ')'
+	  { $$= GEOM_NEW(Item_func_spatial_collection(* $3,
+	          Geometry::wkb_polygon, Geometry::wkb_linestring)); }
         ;
 
 /* Regular function calls. The function name is *not* a token */
@@ -6444,16 +6416,20 @@ function_call:
         }
 	| ident '.' ident '(' udf_expr_list ')'
 	{
-	  LEX *lex= Lex;
-	  sp_name *name= new sp_name($1, $3);
+          THD *thd= YYTHD;
+          create_qfunc *builder;
+          Item *item= NULL;
+          int error;
 
-	  name->init_qname(YYTHD);
-	  sp_add_used_routine(lex, YYTHD, name, TYPE_ENUM_FUNCTION);
-	  if ($5)
-	    $$= new Item_func_sp(Lex->current_context(), name, *$5);
-	  else
-	    $$= new Item_func_sp(Lex->current_context(), name);
-	  lex->safe_to_cache_query=0;
+          builder= find_sp_function_builder(thd);
+          DBUG_ASSERT(builder);
+          error= builder->create(thd, $1, $3, $5, item);
+
+          if (error)
+          {
+            YYABORT;
+          }
+          $$ = item;
 	}
         ;
 
@@ -9237,8 +9213,8 @@ keyword_sp:
               See
               bool_pri :
               bool_pri comp_op ANY_SYM in_subselect %prec EQ
+              TODO: WARN_DEPRECATED()
             */
-            WARN_DEPRECATED(YYTHD, "5.2", "ANY as an identifier", "`ANY`");
           }
 	| AT_SYM                {}
 	| AUTHORS_SYM		{}

--- 1.120/sql/share/errmsg.txt	2006-09-27 15:39:23 -07:00
+++ 1.121/sql/share/errmsg.txt	2006-09-27 15:39:23 -07:00
@@ -5960,3 +5960,7 @@ ER_HOSTNAME
 	eng "host name"
 ER_WRONG_STRING_LENGTH
 	eng "String '%-.70s' is too long for %s (should be no longer than %d)"
+ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT 42000 
+        eng "Incorrect parameter count to builtin function '%-.64s'"
+ER_WRONG_PARAMETERS_TO_BUILTIN_FCT 42000
+        eng "Incorrect parameters to builtin function '%-.64s'"

--- 1.2/mysql-test/r/parser_stress_func_innodb.result	2006-09-27 15:39:24 -07:00
+++ 1.3/mysql-test/r/parser_stress_func_innodb.result	2006-09-27 15:39:24 -07:00
@@ -42,7 +42,7 @@ DROP TABLE bug21114_child;
 DROP TABLE ABS;
 drop table if exists $FCT;
 drop table if exists bug21114_child;
-CREATE TABLE ACOS(
+CREATE TABLE FIELD(
 col1 int not null,
 col2 int not null,
 col3 varchar(10),
@@ -55,13 +55,13 @@ fk_col2 int not null,
 fk_col3 int not null,
 fk_col4 int not null,
 CONSTRAINT fk_fct FOREIGN KEY (fk_col1, fk_col2)
-REFERENCES ACOS(col1, col2),
+REFERENCES FIELD(col1, col2),
 CONSTRAINT fk_fct_space FOREIGN KEY (fk_col3, fk_col4)
-REFERENCES ACOS (col1, col2)
+REFERENCES FIELD (col1, col2)
 ) ENGINE InnoDb;
-SHOW CREATE TABLE ACOS;
+SHOW CREATE TABLE FIELD;
 Table	Create Table
-ACOS	CREATE TABLE `ACOS` (
+FIELD	CREATE TABLE `FIELD` (
   `col1` int(11) NOT NULL,
   `col2` int(11) NOT NULL,
   `col3` varchar(10) DEFAULT NULL,
@@ -77,14 +77,14 @@ bug21114_child	CREATE TABLE `bug21114_ch
   `fk_col4` int(11) NOT NULL,
   KEY `fk_fct` (`fk_col1`,`fk_col2`),
   KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ACOS` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ACOS` (`col1`, `col2`)
+  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `FIELD` (`col1`, `col2`),
+  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `FIELD` (`col1`, `col2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
-DROP TABLE ACOS;
+DROP TABLE FIELD;
 drop table if exists $FCT;
 drop table if exists bug21114_child;
-CREATE TABLE ADDDATE(
+CREATE TABLE FORMAT(
 col1 int not null,
 col2 int not null,
 col3 varchar(10),
@@ -97,13 +97,13 @@ fk_col2 int not null,
 fk_col3 int not null,
 fk_col4 int not null,
 CONSTRAINT fk_fct FOREIGN KEY (fk_col1, fk_col2)
-REFERENCES ADDDATE(col1, col2),
+REFERENCES FORMAT(col1, col2),
 CONSTRAINT fk_fct_space FOREIGN KEY (fk_col3, fk_col4)
-REFERENCES ADDDATE (col1, col2)
+REFERENCES FORMAT (col1, col2)
 ) ENGINE InnoDb;
-SHOW CREATE TABLE ADDDATE;
+SHOW CREATE TABLE FORMAT;
 Table	Create Table
-ADDDATE	CREATE TABLE `ADDDATE` (
+FORMAT	CREATE TABLE `FORMAT` (
   `col1` int(11) NOT NULL,
   `col2` int(11) NOT NULL,
   `col3` varchar(10) DEFAULT NULL,
@@ -119,10 +119,56 @@ bug21114_child	CREATE TABLE `bug21114_ch
   `fk_col4` int(11) NOT NULL,
   KEY `fk_fct` (`fk_col1`,`fk_col2`),
   KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ADDDATE` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ADDDATE` (`col1`, `col2`)
+  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `FORMAT` (`col1`, `col2`),
+  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `FORMAT` (`col1`, `col2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
+DROP TABLE FORMAT;
+drop table if exists $FCT;
+drop table if exists bug21114_child;
+CREATE TABLE ACOS(
+col1 int not null,
+col2 int not null,
+col3 varchar(10),
+CONSTRAINT pk PRIMARY KEY (col1, col2)
+) ENGINE InnoDb;
+CREATE TABLE bug21114_child(
+pk int not null,
+fk_col1 int not null,
+fk_col2 int not null,
+fk_col3 int not null,
+fk_col4 int not null,
+CONSTRAINT fk_fct FOREIGN KEY (fk_col1, fk_col2)
+REFERENCES ACOS(col1, col2),
+CONSTRAINT fk_fct_space FOREIGN KEY (fk_col3, fk_col4)
+REFERENCES ACOS (col1, col2)
+) ENGINE InnoDb;
+SHOW CREATE TABLE ACOS;
+SHOW CREATE TABLE bug21114_child;
+DROP TABLE bug21114_child;
+DROP TABLE ACOS;
+drop table if exists $FCT;
+drop table if exists bug21114_child;
+CREATE TABLE ADDDATE(
+col1 int not null,
+col2 int not null,
+col3 varchar(10),
+CONSTRAINT pk PRIMARY KEY (col1, col2)
+) ENGINE InnoDb;
+CREATE TABLE bug21114_child(
+pk int not null,
+fk_col1 int not null,
+fk_col2 int not null,
+fk_col3 int not null,
+fk_col4 int not null,
+CONSTRAINT fk_fct FOREIGN KEY (fk_col1, fk_col2)
+REFERENCES ADDDATE(col1, col2),
+CONSTRAINT fk_fct_space FOREIGN KEY (fk_col3, fk_col4)
+REFERENCES ADDDATE (col1, col2)
+) ENGINE InnoDb;
+SHOW CREATE TABLE ADDDATE;
+SHOW CREATE TABLE bug21114_child;
+DROP TABLE bug21114_child;
 DROP TABLE ADDDATE;
 drop table if exists $FCT;
 drop table if exists bug21114_child;
@@ -144,26 +190,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES ADDTIME (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE ADDTIME;
-Table	Create Table
-ADDTIME	CREATE TABLE `ADDTIME` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ADDTIME` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ADDTIME` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE ADDTIME;
 drop table if exists $FCT;
@@ -186,26 +213,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES AES_DECRYPT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE AES_DECRYPT;
-Table	Create Table
-AES_DECRYPT	CREATE TABLE `AES_DECRYPT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `AES_DECRYPT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `AES_DECRYPT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE AES_DECRYPT;
 drop table if exists $FCT;
@@ -228,26 +236,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES AES_ENCRYPT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE AES_ENCRYPT;
-Table	Create Table
-AES_ENCRYPT	CREATE TABLE `AES_ENCRYPT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `AES_ENCRYPT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `AES_ENCRYPT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE AES_ENCRYPT;
 drop table if exists $FCT;
@@ -270,26 +259,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES AREA (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE AREA;
-Table	Create Table
-AREA	CREATE TABLE `AREA` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `AREA` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `AREA` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE AREA;
 drop table if exists $FCT;
@@ -312,26 +282,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES ASBINARY (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE ASBINARY;
-Table	Create Table
-ASBINARY	CREATE TABLE `ASBINARY` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ASBINARY` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ASBINARY` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE ASBINARY;
 drop table if exists $FCT;
@@ -354,26 +305,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES ASIN (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE ASIN;
-Table	Create Table
-ASIN	CREATE TABLE `ASIN` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ASIN` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ASIN` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE ASIN;
 drop table if exists $FCT;
@@ -396,26 +328,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES ASTEXT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE ASTEXT;
-Table	Create Table
-ASTEXT	CREATE TABLE `ASTEXT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ASTEXT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ASTEXT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE ASTEXT;
 drop table if exists $FCT;
@@ -438,26 +351,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES ASWKB (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE ASWKB;
-Table	Create Table
-ASWKB	CREATE TABLE `ASWKB` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ASWKB` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ASWKB` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE ASWKB;
 drop table if exists $FCT;
@@ -480,26 +374,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES ASWKT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE ASWKT;
-Table	Create Table
-ASWKT	CREATE TABLE `ASWKT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ASWKT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ASWKT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE ASWKT;
 drop table if exists $FCT;
@@ -522,26 +397,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES ATAN (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE ATAN;
-Table	Create Table
-ATAN	CREATE TABLE `ATAN` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ATAN` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ATAN` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE ATAN;
 drop table if exists $FCT;
@@ -564,26 +420,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES ATAN2 (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE ATAN2;
-Table	Create Table
-ATAN2	CREATE TABLE `ATAN2` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ATAN2` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ATAN2` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE ATAN2;
 drop table if exists $FCT;
@@ -606,26 +443,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES BENCHMARK (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE BENCHMARK;
-Table	Create Table
-BENCHMARK	CREATE TABLE `BENCHMARK` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `BENCHMARK` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `BENCHMARK` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE BENCHMARK;
 drop table if exists $FCT;
@@ -648,26 +466,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES BIN (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE BIN;
-Table	Create Table
-BIN	CREATE TABLE `BIN` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `BIN` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `BIN` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE BIN;
 drop table if exists $FCT;
@@ -690,26 +489,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES BIT_COUNT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE BIT_COUNT;
-Table	Create Table
-BIT_COUNT	CREATE TABLE `BIT_COUNT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `BIT_COUNT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `BIT_COUNT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE BIT_COUNT;
 drop table if exists $FCT;
@@ -732,26 +512,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES BIT_LENGTH (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE BIT_LENGTH;
-Table	Create Table
-BIT_LENGTH	CREATE TABLE `BIT_LENGTH` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `BIT_LENGTH` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `BIT_LENGTH` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE BIT_LENGTH;
 drop table if exists $FCT;
@@ -774,26 +535,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES CEIL (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE CEIL;
-Table	Create Table
-CEIL	CREATE TABLE `CEIL` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `CEIL` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `CEIL` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE CEIL;
 drop table if exists $FCT;
@@ -816,26 +558,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES CEILING (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE CEILING;
-Table	Create Table
-CEILING	CREATE TABLE `CEILING` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `CEILING` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `CEILING` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE CEILING;
 drop table if exists $FCT;
@@ -858,26 +581,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES CENTROID (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE CENTROID;
-Table	Create Table
-CENTROID	CREATE TABLE `CENTROID` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `CENTROID` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `CENTROID` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE CENTROID;
 drop table if exists $FCT;
@@ -900,26 +604,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES CHARACTER_LENGTH (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE CHARACTER_LENGTH;
-Table	Create Table
-CHARACTER_LENGTH	CREATE TABLE `CHARACTER_LENGTH` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `CHARACTER_LENGTH` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `CHARACTER_LENGTH` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE CHARACTER_LENGTH;
 drop table if exists $FCT;
@@ -942,26 +627,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES CHAR_LENGTH (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE CHAR_LENGTH;
-Table	Create Table
-CHAR_LENGTH	CREATE TABLE `CHAR_LENGTH` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `CHAR_LENGTH` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `CHAR_LENGTH` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE CHAR_LENGTH;
 drop table if exists $FCT;
@@ -984,26 +650,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES COERCIBILITY (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE COERCIBILITY;
-Table	Create Table
-COERCIBILITY	CREATE TABLE `COERCIBILITY` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `COERCIBILITY` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `COERCIBILITY` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE COERCIBILITY;
 drop table if exists $FCT;
@@ -1026,26 +673,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES COMPRESS (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE COMPRESS;
-Table	Create Table
-COMPRESS	CREATE TABLE `COMPRESS` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `COMPRESS` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `COMPRESS` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE COMPRESS;
 drop table if exists $FCT;
@@ -1068,26 +696,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES CONCAT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE CONCAT;
-Table	Create Table
-CONCAT	CREATE TABLE `CONCAT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `CONCAT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `CONCAT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE CONCAT;
 drop table if exists $FCT;
@@ -1110,26 +719,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES CONCAT_WS (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE CONCAT_WS;
-Table	Create Table
-CONCAT_WS	CREATE TABLE `CONCAT_WS` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `CONCAT_WS` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `CONCAT_WS` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE CONCAT_WS;
 drop table if exists $FCT;
@@ -1152,26 +742,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES CONNECTION_ID (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE CONNECTION_ID;
-Table	Create Table
-CONNECTION_ID	CREATE TABLE `CONNECTION_ID` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `CONNECTION_ID` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `CONNECTION_ID` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE CONNECTION_ID;
 drop table if exists $FCT;
@@ -1194,26 +765,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES CONV (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE CONV;
-Table	Create Table
-CONV	CREATE TABLE `CONV` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `CONV` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `CONV` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE CONV;
 drop table if exists $FCT;
@@ -1236,26 +788,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES CONVERT_TZ (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE CONVERT_TZ;
-Table	Create Table
-CONVERT_TZ	CREATE TABLE `CONVERT_TZ` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `CONVERT_TZ` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `CONVERT_TZ` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE CONVERT_TZ;
 drop table if exists $FCT;
@@ -1278,26 +811,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES COS (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE COS;
-Table	Create Table
-COS	CREATE TABLE `COS` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `COS` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `COS` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE COS;
 drop table if exists $FCT;
@@ -1320,26 +834,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES COT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE COT;
-Table	Create Table
-COT	CREATE TABLE `COT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `COT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `COT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE COT;
 drop table if exists $FCT;
@@ -1362,26 +857,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES CRC32 (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE CRC32;
-Table	Create Table
-CRC32	CREATE TABLE `CRC32` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `CRC32` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `CRC32` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE CRC32;
 drop table if exists $FCT;
@@ -1404,26 +880,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES CROSSES (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE CROSSES;
-Table	Create Table
-CROSSES	CREATE TABLE `CROSSES` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `CROSSES` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `CROSSES` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE CROSSES;
 drop table if exists $FCT;
@@ -1446,26 +903,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES DATEDIFF (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE DATEDIFF;
-Table	Create Table
-DATEDIFF	CREATE TABLE `DATEDIFF` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `DATEDIFF` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `DATEDIFF` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE DATEDIFF;
 drop table if exists $FCT;
@@ -1488,26 +926,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES DATE_FORMAT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE DATE_FORMAT;
-Table	Create Table
-DATE_FORMAT	CREATE TABLE `DATE_FORMAT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `DATE_FORMAT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `DATE_FORMAT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE DATE_FORMAT;
 drop table if exists $FCT;
@@ -1530,26 +949,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES DAYNAME (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE DAYNAME;
-Table	Create Table
-DAYNAME	CREATE TABLE `DAYNAME` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `DAYNAME` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `DAYNAME` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE DAYNAME;
 drop table if exists $FCT;
@@ -1572,26 +972,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES DAYOFMONTH (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE DAYOFMONTH;
-Table	Create Table
-DAYOFMONTH	CREATE TABLE `DAYOFMONTH` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `DAYOFMONTH` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `DAYOFMONTH` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE DAYOFMONTH;
 drop table if exists $FCT;
@@ -1614,26 +995,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES DAYOFWEEK (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE DAYOFWEEK;
-Table	Create Table
-DAYOFWEEK	CREATE TABLE `DAYOFWEEK` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `DAYOFWEEK` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `DAYOFWEEK` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE DAYOFWEEK;
 drop table if exists $FCT;
@@ -1656,26 +1018,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES DAYOFYEAR (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE DAYOFYEAR;
-Table	Create Table
-DAYOFYEAR	CREATE TABLE `DAYOFYEAR` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `DAYOFYEAR` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `DAYOFYEAR` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE DAYOFYEAR;
 drop table if exists $FCT;
@@ -1698,26 +1041,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES DECODE (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE DECODE;
-Table	Create Table
-DECODE	CREATE TABLE `DECODE` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `DECODE` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `DECODE` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE DECODE;
 drop table if exists $FCT;
@@ -1740,26 +1064,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES DEGREES (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE DEGREES;
-Table	Create Table
-DEGREES	CREATE TABLE `DEGREES` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `DEGREES` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `DEGREES` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE DEGREES;
 drop table if exists $FCT;
@@ -1782,26 +1087,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES DES_DECRYPT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE DES_DECRYPT;
-Table	Create Table
-DES_DECRYPT	CREATE TABLE `DES_DECRYPT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `DES_DECRYPT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `DES_DECRYPT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE DES_DECRYPT;
 drop table if exists $FCT;
@@ -1824,26 +1110,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES DES_ENCRYPT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE DES_ENCRYPT;
-Table	Create Table
-DES_ENCRYPT	CREATE TABLE `DES_ENCRYPT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `DES_ENCRYPT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `DES_ENCRYPT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE DES_ENCRYPT;
 drop table if exists $FCT;
@@ -1866,26 +1133,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES DIMENSION (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE DIMENSION;
-Table	Create Table
-DIMENSION	CREATE TABLE `DIMENSION` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `DIMENSION` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `DIMENSION` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE DIMENSION;
 drop table if exists $FCT;
@@ -1908,26 +1156,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES DISJOINT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE DISJOINT;
-Table	Create Table
-DISJOINT	CREATE TABLE `DISJOINT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `DISJOINT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `DISJOINT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE DISJOINT;
 drop table if exists $FCT;
@@ -1950,26 +1179,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES ELT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE ELT;
-Table	Create Table
-ELT	CREATE TABLE `ELT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ELT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ELT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE ELT;
 drop table if exists $FCT;
@@ -1992,26 +1202,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES ENCODE (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE ENCODE;
-Table	Create Table
-ENCODE	CREATE TABLE `ENCODE` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ENCODE` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ENCODE` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE ENCODE;
 drop table if exists $FCT;
@@ -2034,26 +1225,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES ENCRYPT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE ENCRYPT;
-Table	Create Table
-ENCRYPT	CREATE TABLE `ENCRYPT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ENCRYPT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ENCRYPT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE ENCRYPT;
 drop table if exists $FCT;
@@ -2076,26 +1248,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES ENDPOINT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE ENDPOINT;
-Table	Create Table
-ENDPOINT	CREATE TABLE `ENDPOINT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ENDPOINT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ENDPOINT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE ENDPOINT;
 drop table if exists $FCT;
@@ -2118,26 +1271,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES ENVELOPE (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE ENVELOPE;
-Table	Create Table
-ENVELOPE	CREATE TABLE `ENVELOPE` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ENVELOPE` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ENVELOPE` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE ENVELOPE;
 drop table if exists $FCT;
@@ -2160,26 +1294,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES EQUALS (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE EQUALS;
-Table	Create Table
-EQUALS	CREATE TABLE `EQUALS` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `EQUALS` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `EQUALS` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE EQUALS;
 drop table if exists $FCT;
@@ -2202,26 +1317,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES EXP (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE EXP;
-Table	Create Table
-EXP	CREATE TABLE `EXP` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `EXP` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `EXP` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE EXP;
 drop table if exists $FCT;
@@ -2244,26 +1340,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES EXPORT_SET (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE EXPORT_SET;
-Table	Create Table
-EXPORT_SET	CREATE TABLE `EXPORT_SET` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `EXPORT_SET` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `EXPORT_SET` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE EXPORT_SET;
 drop table if exists $FCT;
@@ -2286,26 +1363,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES EXTERIORRING (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE EXTERIORRING;
-Table	Create Table
-EXTERIORRING	CREATE TABLE `EXTERIORRING` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `EXTERIORRING` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `EXTERIORRING` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE EXTERIORRING;
 drop table if exists $FCT;
@@ -2328,72 +1386,11 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES EXTRACTVALUE (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE EXTRACTVALUE;
-Table	Create Table
-EXTRACTVALUE	CREATE TABLE `EXTRACTVALUE` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `EXTRACTVALUE` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `EXTRACTVALUE` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE EXTRACTVALUE;
 drop table if exists $FCT;
 drop table if exists bug21114_child;
-CREATE TABLE FIELD(
-col1 int not null,
-col2 int not null,
-col3 varchar(10),
-CONSTRAINT pk PRIMARY KEY (col1, col2)
-) ENGINE InnoDb;
-CREATE TABLE bug21114_child(
-pk int not null,
-fk_col1 int not null,
-fk_col2 int not null,
-fk_col3 int not null,
-fk_col4 int not null,
-CONSTRAINT fk_fct FOREIGN KEY (fk_col1, fk_col2)
-REFERENCES FIELD(col1, col2),
-CONSTRAINT fk_fct_space FOREIGN KEY (fk_col3, fk_col4)
-REFERENCES FIELD (col1, col2)
-) ENGINE InnoDb;
-SHOW CREATE TABLE FIELD;
-Table	Create Table
-FIELD	CREATE TABLE `FIELD` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
-SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `FIELD` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `FIELD` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
-DROP TABLE bug21114_child;
-DROP TABLE FIELD;
-drop table if exists $FCT;
-drop table if exists bug21114_child;
 CREATE TABLE FIND_IN_SET(
 col1 int not null,
 col2 int not null,
@@ -2412,26 +1409,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES FIND_IN_SET (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE FIND_IN_SET;
-Table	Create Table
-FIND_IN_SET	CREATE TABLE `FIND_IN_SET` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `FIND_IN_SET` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `FIND_IN_SET` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE FIND_IN_SET;
 drop table if exists $FCT;
@@ -2454,72 +1432,11 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES FLOOR (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE FLOOR;
-Table	Create Table
-FLOOR	CREATE TABLE `FLOOR` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `FLOOR` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `FLOOR` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE FLOOR;
 drop table if exists $FCT;
 drop table if exists bug21114_child;
-CREATE TABLE FORMAT(
-col1 int not null,
-col2 int not null,
-col3 varchar(10),
-CONSTRAINT pk PRIMARY KEY (col1, col2)
-) ENGINE InnoDb;
-CREATE TABLE bug21114_child(
-pk int not null,
-fk_col1 int not null,
-fk_col2 int not null,
-fk_col3 int not null,
-fk_col4 int not null,
-CONSTRAINT fk_fct FOREIGN KEY (fk_col1, fk_col2)
-REFERENCES FORMAT(col1, col2),
-CONSTRAINT fk_fct_space FOREIGN KEY (fk_col3, fk_col4)
-REFERENCES FORMAT (col1, col2)
-) ENGINE InnoDb;
-SHOW CREATE TABLE FORMAT;
-Table	Create Table
-FORMAT	CREATE TABLE `FORMAT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
-SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `FORMAT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `FORMAT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
-DROP TABLE bug21114_child;
-DROP TABLE FORMAT;
-drop table if exists $FCT;
-drop table if exists bug21114_child;
 CREATE TABLE FOUND_ROWS(
 col1 int not null,
 col2 int not null,
@@ -2538,26 +1455,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES FOUND_ROWS (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE FOUND_ROWS;
-Table	Create Table
-FOUND_ROWS	CREATE TABLE `FOUND_ROWS` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `FOUND_ROWS` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `FOUND_ROWS` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE FOUND_ROWS;
 drop table if exists $FCT;
@@ -2580,26 +1478,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES FROM_DAYS (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE FROM_DAYS;
-Table	Create Table
-FROM_DAYS	CREATE TABLE `FROM_DAYS` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `FROM_DAYS` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `FROM_DAYS` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE FROM_DAYS;
 drop table if exists $FCT;
@@ -2622,26 +1501,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES FROM_UNIXTIME (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE FROM_UNIXTIME;
-Table	Create Table
-FROM_UNIXTIME	CREATE TABLE `FROM_UNIXTIME` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `FROM_UNIXTIME` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `FROM_UNIXTIME` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE FROM_UNIXTIME;
 drop table if exists $FCT;
@@ -2664,26 +1524,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES GEOMCOLLFROMTEXT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE GEOMCOLLFROMTEXT;
-Table	Create Table
-GEOMCOLLFROMTEXT	CREATE TABLE `GEOMCOLLFROMTEXT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `GEOMCOLLFROMTEXT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `GEOMCOLLFROMTEXT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE GEOMCOLLFROMTEXT;
 drop table if exists $FCT;
@@ -2706,26 +1547,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES GEOMCOLLFROMWKB (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE GEOMCOLLFROMWKB;
-Table	Create Table
-GEOMCOLLFROMWKB	CREATE TABLE `GEOMCOLLFROMWKB` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `GEOMCOLLFROMWKB` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `GEOMCOLLFROMWKB` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE GEOMCOLLFROMWKB;
 drop table if exists $FCT;
@@ -2748,26 +1570,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES GEOMETRYCOLLECTIONFROMTEXT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE GEOMETRYCOLLECTIONFROMTEXT;
-Table	Create Table
-GEOMETRYCOLLECTIONFROMTEXT	CREATE TABLE `GEOMETRYCOLLECTIONFROMTEXT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `GEOMETRYCOLLECTIONFROMTEXT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `GEOMETRYCOLLECTIONFROMTEXT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE GEOMETRYCOLLECTIONFROMTEXT;
 drop table if exists $FCT;
@@ -2790,26 +1593,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES GEOMETRYCOLLECTIONFROMWKB (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE GEOMETRYCOLLECTIONFROMWKB;
-Table	Create Table
-GEOMETRYCOLLECTIONFROMWKB	CREATE TABLE `GEOMETRYCOLLECTIONFROMWKB` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `GEOMETRYCOLLECTIONFROMWKB` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `GEOMETRYCOLLECTIONFROMWKB` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE GEOMETRYCOLLECTIONFROMWKB;
 drop table if exists $FCT;
@@ -2832,26 +1616,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES GEOMETRYFROMTEXT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE GEOMETRYFROMTEXT;
-Table	Create Table
-GEOMETRYFROMTEXT	CREATE TABLE `GEOMETRYFROMTEXT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `GEOMETRYFROMTEXT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `GEOMETRYFROMTEXT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE GEOMETRYFROMTEXT;
 drop table if exists $FCT;
@@ -2874,26 +1639,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES GEOMETRYFROMWKB (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE GEOMETRYFROMWKB;
-Table	Create Table
-GEOMETRYFROMWKB	CREATE TABLE `GEOMETRYFROMWKB` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `GEOMETRYFROMWKB` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `GEOMETRYFROMWKB` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE GEOMETRYFROMWKB;
 drop table if exists $FCT;
@@ -2916,26 +1662,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES GEOMETRYN (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE GEOMETRYN;
-Table	Create Table
-GEOMETRYN	CREATE TABLE `GEOMETRYN` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `GEOMETRYN` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `GEOMETRYN` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE GEOMETRYN;
 drop table if exists $FCT;
@@ -2958,26 +1685,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES GEOMETRYTYPE (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE GEOMETRYTYPE;
-Table	Create Table
-GEOMETRYTYPE	CREATE TABLE `GEOMETRYTYPE` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `GEOMETRYTYPE` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `GEOMETRYTYPE` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE GEOMETRYTYPE;
 drop table if exists $FCT;
@@ -3000,26 +1708,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES GEOMFROMTEXT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE GEOMFROMTEXT;
-Table	Create Table
-GEOMFROMTEXT	CREATE TABLE `GEOMFROMTEXT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `GEOMFROMTEXT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `GEOMFROMTEXT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE GEOMFROMTEXT;
 drop table if exists $FCT;
@@ -3042,26 +1731,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES GEOMFROMWKB (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE GEOMFROMWKB;
-Table	Create Table
-GEOMFROMWKB	CREATE TABLE `GEOMFROMWKB` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `GEOMFROMWKB` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `GEOMFROMWKB` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE GEOMFROMWKB;
 drop table if exists $FCT;
@@ -3084,26 +1754,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES GET_LOCK (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE GET_LOCK;
-Table	Create Table
-GET_LOCK	CREATE TABLE `GET_LOCK` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `GET_LOCK` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `GET_LOCK` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE GET_LOCK;
 drop table if exists $FCT;
@@ -3126,26 +1777,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES GLENGTH (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE GLENGTH;
-Table	Create Table
-GLENGTH	CREATE TABLE `GLENGTH` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `GLENGTH` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `GLENGTH` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE GLENGTH;
 drop table if exists $FCT;
@@ -3168,26 +1800,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES GREATEST (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE GREATEST;
-Table	Create Table
-GREATEST	CREATE TABLE `GREATEST` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `GREATEST` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `GREATEST` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE GREATEST;
 drop table if exists $FCT;
@@ -3210,26 +1823,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES HEX (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE HEX;
-Table	Create Table
-HEX	CREATE TABLE `HEX` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `HEX` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `HEX` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE HEX;
 drop table if exists $FCT;
@@ -3252,26 +1846,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES IFNULL (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE IFNULL;
-Table	Create Table
-IFNULL	CREATE TABLE `IFNULL` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `IFNULL` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `IFNULL` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE IFNULL;
 drop table if exists $FCT;
@@ -3294,26 +1869,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES INET_ATON (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE INET_ATON;
-Table	Create Table
-INET_ATON	CREATE TABLE `INET_ATON` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `INET_ATON` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `INET_ATON` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE INET_ATON;
 drop table if exists $FCT;
@@ -3336,26 +1892,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES INET_NTOA (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE INET_NTOA;
-Table	Create Table
-INET_NTOA	CREATE TABLE `INET_NTOA` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `INET_NTOA` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `INET_NTOA` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE INET_NTOA;
 drop table if exists $FCT;
@@ -3378,26 +1915,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES INSTR (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE INSTR;
-Table	Create Table
-INSTR	CREATE TABLE `INSTR` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `INSTR` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `INSTR` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE INSTR;
 drop table if exists $FCT;
@@ -3420,26 +1938,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES INTERIORRINGN (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE INTERIORRINGN;
-Table	Create Table
-INTERIORRINGN	CREATE TABLE `INTERIORRINGN` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `INTERIORRINGN` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `INTERIORRINGN` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE INTERIORRINGN;
 drop table if exists $FCT;
@@ -3462,26 +1961,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES INTERSECTS (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE INTERSECTS;
-Table	Create Table
-INTERSECTS	CREATE TABLE `INTERSECTS` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `INTERSECTS` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `INTERSECTS` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE INTERSECTS;
 drop table if exists $FCT;
@@ -3504,26 +1984,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES ISCLOSED (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE ISCLOSED;
-Table	Create Table
-ISCLOSED	CREATE TABLE `ISCLOSED` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ISCLOSED` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ISCLOSED` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE ISCLOSED;
 drop table if exists $FCT;
@@ -3546,26 +2007,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES ISEMPTY (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE ISEMPTY;
-Table	Create Table
-ISEMPTY	CREATE TABLE `ISEMPTY` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ISEMPTY` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ISEMPTY` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE ISEMPTY;
 drop table if exists $FCT;
@@ -3588,26 +2030,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES ISNULL (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE ISNULL;
-Table	Create Table
-ISNULL	CREATE TABLE `ISNULL` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ISNULL` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ISNULL` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE ISNULL;
 drop table if exists $FCT;
@@ -3630,26 +2053,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES ISSIMPLE (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE ISSIMPLE;
-Table	Create Table
-ISSIMPLE	CREATE TABLE `ISSIMPLE` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ISSIMPLE` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ISSIMPLE` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE ISSIMPLE;
 drop table if exists $FCT;
@@ -3672,26 +2076,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES IS_FREE_LOCK (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE IS_FREE_LOCK;
-Table	Create Table
-IS_FREE_LOCK	CREATE TABLE `IS_FREE_LOCK` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `IS_FREE_LOCK` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `IS_FREE_LOCK` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE IS_FREE_LOCK;
 drop table if exists $FCT;
@@ -3714,26 +2099,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES IS_USED_LOCK (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE IS_USED_LOCK;
-Table	Create Table
-IS_USED_LOCK	CREATE TABLE `IS_USED_LOCK` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `IS_USED_LOCK` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `IS_USED_LOCK` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE IS_USED_LOCK;
 drop table if exists $FCT;
@@ -3756,26 +2122,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES LAST_DAY (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE LAST_DAY;
-Table	Create Table
-LAST_DAY	CREATE TABLE `LAST_DAY` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `LAST_DAY` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `LAST_DAY` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE LAST_DAY;
 drop table if exists $FCT;
@@ -3798,26 +2145,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES LAST_INSERT_ID (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE LAST_INSERT_ID;
-Table	Create Table
-LAST_INSERT_ID	CREATE TABLE `LAST_INSERT_ID` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `LAST_INSERT_ID` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `LAST_INSERT_ID` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE LAST_INSERT_ID;
 drop table if exists $FCT;
@@ -3840,26 +2168,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES LCASE (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE LCASE;
-Table	Create Table
-LCASE	CREATE TABLE `LCASE` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `LCASE` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `LCASE` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE LCASE;
 drop table if exists $FCT;
@@ -3882,26 +2191,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES LEAST (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE LEAST;
-Table	Create Table
-LEAST	CREATE TABLE `LEAST` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `LEAST` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `LEAST` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE LEAST;
 drop table if exists $FCT;
@@ -3924,26 +2214,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES LENGTH (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE LENGTH;
-Table	Create Table
-LENGTH	CREATE TABLE `LENGTH` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `LENGTH` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `LENGTH` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE LENGTH;
 drop table if exists $FCT;
@@ -3966,26 +2237,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES LINEFROMTEXT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE LINEFROMTEXT;
-Table	Create Table
-LINEFROMTEXT	CREATE TABLE `LINEFROMTEXT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `LINEFROMTEXT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `LINEFROMTEXT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE LINEFROMTEXT;
 drop table if exists $FCT;
@@ -4008,26 +2260,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES LINEFROMWKB (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE LINEFROMWKB;
-Table	Create Table
-LINEFROMWKB	CREATE TABLE `LINEFROMWKB` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `LINEFROMWKB` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `LINEFROMWKB` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE LINEFROMWKB;
 drop table if exists $FCT;
@@ -4050,26 +2283,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES LINESTRINGFROMTEXT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE LINESTRINGFROMTEXT;
-Table	Create Table
-LINESTRINGFROMTEXT	CREATE TABLE `LINESTRINGFROMTEXT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `LINESTRINGFROMTEXT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `LINESTRINGFROMTEXT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE LINESTRINGFROMTEXT;
 drop table if exists $FCT;
@@ -4092,26 +2306,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES LINESTRINGFROMWKB (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE LINESTRINGFROMWKB;
-Table	Create Table
-LINESTRINGFROMWKB	CREATE TABLE `LINESTRINGFROMWKB` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `LINESTRINGFROMWKB` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `LINESTRINGFROMWKB` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE LINESTRINGFROMWKB;
 drop table if exists $FCT;
@@ -4134,26 +2329,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES LN (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE LN;
-Table	Create Table
-LN	CREATE TABLE `LN` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `LN` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `LN` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE LN;
 drop table if exists $FCT;
@@ -4176,26 +2352,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES LOAD_FILE (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE LOAD_FILE;
-Table	Create Table
-LOAD_FILE	CREATE TABLE `LOAD_FILE` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `LOAD_FILE` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `LOAD_FILE` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE LOAD_FILE;
 drop table if exists $FCT;
@@ -4218,26 +2375,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES LOCATE (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE LOCATE;
-Table	Create Table
-LOCATE	CREATE TABLE `LOCATE` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `LOCATE` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `LOCATE` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE LOCATE;
 drop table if exists $FCT;
@@ -4260,26 +2398,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES LOG (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE LOG;
-Table	Create Table
-LOG	CREATE TABLE `LOG` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `LOG` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `LOG` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE LOG;
 drop table if exists $FCT;
@@ -4302,26 +2421,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES LOG10 (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE LOG10;
-Table	Create Table
-LOG10	CREATE TABLE `LOG10` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `LOG10` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `LOG10` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE LOG10;
 drop table if exists $FCT;
@@ -4344,26 +2444,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES LOG2 (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE LOG2;
-Table	Create Table
-LOG2	CREATE TABLE `LOG2` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `LOG2` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `LOG2` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE LOG2;
 drop table if exists $FCT;
@@ -4386,26 +2467,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES LOWER (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE LOWER;
-Table	Create Table
-LOWER	CREATE TABLE `LOWER` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `LOWER` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `LOWER` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE LOWER;
 drop table if exists $FCT;
@@ -4428,26 +2490,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES LPAD (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE LPAD;
-Table	Create Table
-LPAD	CREATE TABLE `LPAD` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `LPAD` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `LPAD` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE LPAD;
 drop table if exists $FCT;
@@ -4470,26 +2513,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES LTRIM (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE LTRIM;
-Table	Create Table
-LTRIM	CREATE TABLE `LTRIM` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `LTRIM` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `LTRIM` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE LTRIM;
 drop table if exists $FCT;
@@ -4512,26 +2536,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MAKEDATE (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MAKEDATE;
-Table	Create Table
-MAKEDATE	CREATE TABLE `MAKEDATE` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MAKEDATE` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MAKEDATE` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MAKEDATE;
 drop table if exists $FCT;
@@ -4554,26 +2559,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MAKETIME (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MAKETIME;
-Table	Create Table
-MAKETIME	CREATE TABLE `MAKETIME` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MAKETIME` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MAKETIME` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MAKETIME;
 drop table if exists $FCT;
@@ -4596,26 +2582,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MAKE_SET (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MAKE_SET;
-Table	Create Table
-MAKE_SET	CREATE TABLE `MAKE_SET` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MAKE_SET` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MAKE_SET` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MAKE_SET;
 drop table if exists $FCT;
@@ -4638,26 +2605,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MASTER_POS_WAIT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MASTER_POS_WAIT;
-Table	Create Table
-MASTER_POS_WAIT	CREATE TABLE `MASTER_POS_WAIT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MASTER_POS_WAIT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MASTER_POS_WAIT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MASTER_POS_WAIT;
 drop table if exists $FCT;
@@ -4680,26 +2628,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MBRCONTAINS (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MBRCONTAINS;
-Table	Create Table
-MBRCONTAINS	CREATE TABLE `MBRCONTAINS` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MBRCONTAINS` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MBRCONTAINS` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MBRCONTAINS;
 drop table if exists $FCT;
@@ -4722,26 +2651,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MBRDISJOINT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MBRDISJOINT;
-Table	Create Table
-MBRDISJOINT	CREATE TABLE `MBRDISJOINT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MBRDISJOINT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MBRDISJOINT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MBRDISJOINT;
 drop table if exists $FCT;
@@ -4764,26 +2674,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MBREQUAL (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MBREQUAL;
-Table	Create Table
-MBREQUAL	CREATE TABLE `MBREQUAL` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MBREQUAL` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MBREQUAL` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MBREQUAL;
 drop table if exists $FCT;
@@ -4806,26 +2697,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MBRINTERSECTS (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MBRINTERSECTS;
-Table	Create Table
-MBRINTERSECTS	CREATE TABLE `MBRINTERSECTS` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MBRINTERSECTS` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MBRINTERSECTS` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MBRINTERSECTS;
 drop table if exists $FCT;
@@ -4848,26 +2720,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MBROVERLAPS (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MBROVERLAPS;
-Table	Create Table
-MBROVERLAPS	CREATE TABLE `MBROVERLAPS` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MBROVERLAPS` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MBROVERLAPS` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MBROVERLAPS;
 drop table if exists $FCT;
@@ -4890,26 +2743,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MBRTOUCHES (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MBRTOUCHES;
-Table	Create Table
-MBRTOUCHES	CREATE TABLE `MBRTOUCHES` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MBRTOUCHES` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MBRTOUCHES` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MBRTOUCHES;
 drop table if exists $FCT;
@@ -4932,26 +2766,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MBRWITHIN (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MBRWITHIN;
-Table	Create Table
-MBRWITHIN	CREATE TABLE `MBRWITHIN` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MBRWITHIN` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MBRWITHIN` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MBRWITHIN;
 drop table if exists $FCT;
@@ -4974,26 +2789,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MD5 (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MD5;
-Table	Create Table
-MD5	CREATE TABLE `MD5` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MD5` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MD5` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MD5;
 drop table if exists $FCT;
@@ -5016,26 +2812,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MLINEFROMTEXT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MLINEFROMTEXT;
-Table	Create Table
-MLINEFROMTEXT	CREATE TABLE `MLINEFROMTEXT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MLINEFROMTEXT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MLINEFROMTEXT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MLINEFROMTEXT;
 drop table if exists $FCT;
@@ -5058,26 +2835,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MLINEFROMWKB (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MLINEFROMWKB;
-Table	Create Table
-MLINEFROMWKB	CREATE TABLE `MLINEFROMWKB` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MLINEFROMWKB` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MLINEFROMWKB` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MLINEFROMWKB;
 drop table if exists $FCT;
@@ -5100,26 +2858,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MONTHNAME (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MONTHNAME;
-Table	Create Table
-MONTHNAME	CREATE TABLE `MONTHNAME` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MONTHNAME` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MONTHNAME` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MONTHNAME;
 drop table if exists $FCT;
@@ -5142,26 +2881,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MPOINTFROMTEXT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MPOINTFROMTEXT;
-Table	Create Table
-MPOINTFROMTEXT	CREATE TABLE `MPOINTFROMTEXT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MPOINTFROMTEXT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MPOINTFROMTEXT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MPOINTFROMTEXT;
 drop table if exists $FCT;
@@ -5184,26 +2904,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MPOINTFROMWKB (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MPOINTFROMWKB;
-Table	Create Table
-MPOINTFROMWKB	CREATE TABLE `MPOINTFROMWKB` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MPOINTFROMWKB` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MPOINTFROMWKB` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MPOINTFROMWKB;
 drop table if exists $FCT;
@@ -5226,26 +2927,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MPOLYFROMTEXT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MPOLYFROMTEXT;
-Table	Create Table
-MPOLYFROMTEXT	CREATE TABLE `MPOLYFROMTEXT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MPOLYFROMTEXT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MPOLYFROMTEXT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MPOLYFROMTEXT;
 drop table if exists $FCT;
@@ -5268,26 +2950,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MPOLYFROMWKB (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MPOLYFROMWKB;
-Table	Create Table
-MPOLYFROMWKB	CREATE TABLE `MPOLYFROMWKB` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MPOLYFROMWKB` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MPOLYFROMWKB` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MPOLYFROMWKB;
 drop table if exists $FCT;
@@ -5310,26 +2973,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MULTILINESTRINGFROMTEXT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MULTILINESTRINGFROMTEXT;
-Table	Create Table
-MULTILINESTRINGFROMTEXT	CREATE TABLE `MULTILINESTRINGFROMTEXT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MULTILINESTRINGFROMTEXT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MULTILINESTRINGFROMTEXT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MULTILINESTRINGFROMTEXT;
 drop table if exists $FCT;
@@ -5352,26 +2996,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MULTILINESTRINGFROMWKB (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MULTILINESTRINGFROMWKB;
-Table	Create Table
-MULTILINESTRINGFROMWKB	CREATE TABLE `MULTILINESTRINGFROMWKB` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MULTILINESTRINGFROMWKB` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MULTILINESTRINGFROMWKB` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MULTILINESTRINGFROMWKB;
 drop table if exists $FCT;
@@ -5394,26 +3019,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MULTIPOINTFROMTEXT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MULTIPOINTFROMTEXT;
-Table	Create Table
-MULTIPOINTFROMTEXT	CREATE TABLE `MULTIPOINTFROMTEXT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MULTIPOINTFROMTEXT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MULTIPOINTFROMTEXT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MULTIPOINTFROMTEXT;
 drop table if exists $FCT;
@@ -5436,26 +3042,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MULTIPOINTFROMWKB (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MULTIPOINTFROMWKB;
-Table	Create Table
-MULTIPOINTFROMWKB	CREATE TABLE `MULTIPOINTFROMWKB` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MULTIPOINTFROMWKB` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MULTIPOINTFROMWKB` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MULTIPOINTFROMWKB;
 drop table if exists $FCT;
@@ -5478,26 +3065,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MULTIPOLYGONFROMTEXT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MULTIPOLYGONFROMTEXT;
-Table	Create Table
-MULTIPOLYGONFROMTEXT	CREATE TABLE `MULTIPOLYGONFROMTEXT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MULTIPOLYGONFROMTEXT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MULTIPOLYGONFROMTEXT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MULTIPOLYGONFROMTEXT;
 drop table if exists $FCT;
@@ -5520,26 +3088,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES MULTIPOLYGONFROMWKB (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE MULTIPOLYGONFROMWKB;
-Table	Create Table
-MULTIPOLYGONFROMWKB	CREATE TABLE `MULTIPOLYGONFROMWKB` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `MULTIPOLYGONFROMWKB` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `MULTIPOLYGONFROMWKB` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE MULTIPOLYGONFROMWKB;
 drop table if exists $FCT;
@@ -5562,26 +3111,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES NAME_CONST (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE NAME_CONST;
-Table	Create Table
-NAME_CONST	CREATE TABLE `NAME_CONST` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `NAME_CONST` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `NAME_CONST` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE NAME_CONST;
 drop table if exists $FCT;
@@ -5604,26 +3134,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES NULLIF (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE NULLIF;
-Table	Create Table
-NULLIF	CREATE TABLE `NULLIF` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `NULLIF` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `NULLIF` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE NULLIF;
 drop table if exists $FCT;
@@ -5646,26 +3157,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES NUMGEOMETRIES (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE NUMGEOMETRIES;
-Table	Create Table
-NUMGEOMETRIES	CREATE TABLE `NUMGEOMETRIES` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `NUMGEOMETRIES` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `NUMGEOMETRIES` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE NUMGEOMETRIES;
 drop table if exists $FCT;
@@ -5688,26 +3180,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES NUMINTERIORRINGS (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE NUMINTERIORRINGS;
-Table	Create Table
-NUMINTERIORRINGS	CREATE TABLE `NUMINTERIORRINGS` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `NUMINTERIORRINGS` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `NUMINTERIORRINGS` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE NUMINTERIORRINGS;
 drop table if exists $FCT;
@@ -5730,26 +3203,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES NUMPOINTS (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE NUMPOINTS;
-Table	Create Table
-NUMPOINTS	CREATE TABLE `NUMPOINTS` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `NUMPOINTS` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `NUMPOINTS` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE NUMPOINTS;
 drop table if exists $FCT;
@@ -5772,26 +3226,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES OCT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE OCT;
-Table	Create Table
-OCT	CREATE TABLE `OCT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `OCT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `OCT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE OCT;
 drop table if exists $FCT;
@@ -5814,26 +3249,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES OCTET_LENGTH (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE OCTET_LENGTH;
-Table	Create Table
-OCTET_LENGTH	CREATE TABLE `OCTET_LENGTH` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `OCTET_LENGTH` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `OCTET_LENGTH` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE OCTET_LENGTH;
 drop table if exists $FCT;
@@ -5856,26 +3272,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES ORD (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE ORD;
-Table	Create Table
-ORD	CREATE TABLE `ORD` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ORD` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ORD` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE ORD;
 drop table if exists $FCT;
@@ -5898,26 +3295,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES OVERLAPS (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE OVERLAPS;
-Table	Create Table
-OVERLAPS	CREATE TABLE `OVERLAPS` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `OVERLAPS` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `OVERLAPS` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE OVERLAPS;
 drop table if exists $FCT;
@@ -5940,26 +3318,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES PERIOD_ADD (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE PERIOD_ADD;
-Table	Create Table
-PERIOD_ADD	CREATE TABLE `PERIOD_ADD` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `PERIOD_ADD` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `PERIOD_ADD` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE PERIOD_ADD;
 drop table if exists $FCT;
@@ -5982,26 +3341,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES PERIOD_DIFF (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE PERIOD_DIFF;
-Table	Create Table
-PERIOD_DIFF	CREATE TABLE `PERIOD_DIFF` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `PERIOD_DIFF` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `PERIOD_DIFF` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE PERIOD_DIFF;
 drop table if exists $FCT;
@@ -6024,26 +3364,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES PI (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE PI;
-Table	Create Table
-PI	CREATE TABLE `PI` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `PI` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `PI` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE PI;
 drop table if exists $FCT;
@@ -6066,26 +3387,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES POINTFROMTEXT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE POINTFROMTEXT;
-Table	Create Table
-POINTFROMTEXT	CREATE TABLE `POINTFROMTEXT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `POINTFROMTEXT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `POINTFROMTEXT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE POINTFROMTEXT;
 drop table if exists $FCT;
@@ -6108,26 +3410,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES POINTFROMWKB (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE POINTFROMWKB;
-Table	Create Table
-POINTFROMWKB	CREATE TABLE `POINTFROMWKB` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `POINTFROMWKB` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `POINTFROMWKB` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE POINTFROMWKB;
 drop table if exists $FCT;
@@ -6150,26 +3433,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES POINTN (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE POINTN;
-Table	Create Table
-POINTN	CREATE TABLE `POINTN` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `POINTN` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `POINTN` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE POINTN;
 drop table if exists $FCT;
@@ -6192,26 +3456,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES POLYFROMTEXT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE POLYFROMTEXT;
-Table	Create Table
-POLYFROMTEXT	CREATE TABLE `POLYFROMTEXT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `POLYFROMTEXT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `POLYFROMTEXT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE POLYFROMTEXT;
 drop table if exists $FCT;
@@ -6234,26 +3479,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES POLYFROMWKB (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE POLYFROMWKB;
-Table	Create Table
-POLYFROMWKB	CREATE TABLE `POLYFROMWKB` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `POLYFROMWKB` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `POLYFROMWKB` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE POLYFROMWKB;
 drop table if exists $FCT;
@@ -6276,26 +3502,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES POLYGONFROMTEXT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE POLYGONFROMTEXT;
-Table	Create Table
-POLYGONFROMTEXT	CREATE TABLE `POLYGONFROMTEXT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `POLYGONFROMTEXT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `POLYGONFROMTEXT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE POLYGONFROMTEXT;
 drop table if exists $FCT;
@@ -6318,26 +3525,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES POLYGONFROMWKB (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE POLYGONFROMWKB;
-Table	Create Table
-POLYGONFROMWKB	CREATE TABLE `POLYGONFROMWKB` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `POLYGONFROMWKB` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `POLYGONFROMWKB` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE POLYGONFROMWKB;
 drop table if exists $FCT;
@@ -6360,26 +3548,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES POW (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE POW;
-Table	Create Table
-POW	CREATE TABLE `POW` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `POW` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `POW` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE POW;
 drop table if exists $FCT;
@@ -6402,26 +3571,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES POWER (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE POWER;
-Table	Create Table
-POWER	CREATE TABLE `POWER` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `POWER` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `POWER` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE POWER;
 drop table if exists $FCT;
@@ -6444,26 +3594,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES QUOTE (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE QUOTE;
-Table	Create Table
-QUOTE	CREATE TABLE `QUOTE` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `QUOTE` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `QUOTE` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE QUOTE;
 drop table if exists $FCT;
@@ -6486,26 +3617,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES RADIANS (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE RADIANS;
-Table	Create Table
-RADIANS	CREATE TABLE `RADIANS` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `RADIANS` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `RADIANS` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE RADIANS;
 drop table if exists $FCT;
@@ -6528,26 +3640,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES RAND (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE RAND;
-Table	Create Table
-RAND	CREATE TABLE `RAND` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `RAND` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `RAND` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE RAND;
 drop table if exists $FCT;
@@ -6570,26 +3663,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES RELEASE_LOCK (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE RELEASE_LOCK;
-Table	Create Table
-RELEASE_LOCK	CREATE TABLE `RELEASE_LOCK` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `RELEASE_LOCK` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `RELEASE_LOCK` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE RELEASE_LOCK;
 drop table if exists $FCT;
@@ -6612,26 +3686,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES REVERSE (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE REVERSE;
-Table	Create Table
-REVERSE	CREATE TABLE `REVERSE` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `REVERSE` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `REVERSE` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE REVERSE;
 drop table if exists $FCT;
@@ -6654,26 +3709,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES ROUND (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE ROUND;
-Table	Create Table
-ROUND	CREATE TABLE `ROUND` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ROUND` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ROUND` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE ROUND;
 drop table if exists $FCT;
@@ -6696,26 +3732,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES ROW_COUNT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE ROW_COUNT;
-Table	Create Table
-ROW_COUNT	CREATE TABLE `ROW_COUNT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `ROW_COUNT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `ROW_COUNT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE ROW_COUNT;
 drop table if exists $FCT;
@@ -6738,26 +3755,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES RPAD (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE RPAD;
-Table	Create Table
-RPAD	CREATE TABLE `RPAD` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `RPAD` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `RPAD` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE RPAD;
 drop table if exists $FCT;
@@ -6780,26 +3778,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES RTRIM (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE RTRIM;
-Table	Create Table
-RTRIM	CREATE TABLE `RTRIM` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `RTRIM` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `RTRIM` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE RTRIM;
 drop table if exists $FCT;
@@ -6822,26 +3801,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES SEC_TO_TIME (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE SEC_TO_TIME;
-Table	Create Table
-SEC_TO_TIME	CREATE TABLE `SEC_TO_TIME` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `SEC_TO_TIME` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `SEC_TO_TIME` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE SEC_TO_TIME;
 drop table if exists $FCT;
@@ -6864,26 +3824,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES SESSION_USER (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE SESSION_USER;
-Table	Create Table
-SESSION_USER	CREATE TABLE `SESSION_USER` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `SESSION_USER` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `SESSION_USER` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE SESSION_USER;
 drop table if exists $FCT;
@@ -6906,26 +3847,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES SHA (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE SHA;
-Table	Create Table
-SHA	CREATE TABLE `SHA` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `SHA` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `SHA` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE SHA;
 drop table if exists $FCT;
@@ -6948,26 +3870,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES SHA1 (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE SHA1;
-Table	Create Table
-SHA1	CREATE TABLE `SHA1` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `SHA1` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `SHA1` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE SHA1;
 drop table if exists $FCT;
@@ -6990,26 +3893,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES SIGN (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE SIGN;
-Table	Create Table
-SIGN	CREATE TABLE `SIGN` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `SIGN` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `SIGN` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE SIGN;
 drop table if exists $FCT;
@@ -7032,26 +3916,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES SIN (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE SIN;
-Table	Create Table
-SIN	CREATE TABLE `SIN` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `SIN` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `SIN` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE SIN;
 drop table if exists $FCT;
@@ -7074,26 +3939,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES SLEEP (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE SLEEP;
-Table	Create Table
-SLEEP	CREATE TABLE `SLEEP` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `SLEEP` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `SLEEP` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE SLEEP;
 drop table if exists $FCT;
@@ -7116,26 +3962,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES SOUNDEX (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE SOUNDEX;
-Table	Create Table
-SOUNDEX	CREATE TABLE `SOUNDEX` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `SOUNDEX` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `SOUNDEX` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE SOUNDEX;
 drop table if exists $FCT;
@@ -7158,26 +3985,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES SPACE (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE SPACE;
-Table	Create Table
-SPACE	CREATE TABLE `SPACE` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `SPACE` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `SPACE` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE SPACE;
 drop table if exists $FCT;
@@ -7200,26 +4008,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES SQRT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE SQRT;
-Table	Create Table
-SQRT	CREATE TABLE `SQRT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `SQRT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `SQRT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE SQRT;
 drop table if exists $FCT;
@@ -7242,26 +4031,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES SRID (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE SRID;
-Table	Create Table
-SRID	CREATE TABLE `SRID` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `SRID` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `SRID` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE SRID;
 drop table if exists $FCT;
@@ -7284,26 +4054,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES STARTPOINT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE STARTPOINT;
-Table	Create Table
-STARTPOINT	CREATE TABLE `STARTPOINT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `STARTPOINT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `STARTPOINT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE STARTPOINT;
 drop table if exists $FCT;
@@ -7326,26 +4077,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES STRCMP (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE STRCMP;
-Table	Create Table
-STRCMP	CREATE TABLE `STRCMP` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `STRCMP` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `STRCMP` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE STRCMP;
 drop table if exists $FCT;
@@ -7368,26 +4100,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES STR_TO_DATE (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE STR_TO_DATE;
-Table	Create Table
-STR_TO_DATE	CREATE TABLE `STR_TO_DATE` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `STR_TO_DATE` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `STR_TO_DATE` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE STR_TO_DATE;
 drop table if exists $FCT;
@@ -7410,26 +4123,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES SUBDATE (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE SUBDATE;
-Table	Create Table
-SUBDATE	CREATE TABLE `SUBDATE` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `SUBDATE` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `SUBDATE` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE SUBDATE;
 drop table if exists $FCT;
@@ -7452,26 +4146,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES SUBSTRING_INDEX (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE SUBSTRING_INDEX;
-Table	Create Table
-SUBSTRING_INDEX	CREATE TABLE `SUBSTRING_INDEX` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `SUBSTRING_INDEX` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `SUBSTRING_INDEX` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE SUBSTRING_INDEX;
 drop table if exists $FCT;
@@ -7494,26 +4169,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES SUBTIME (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE SUBTIME;
-Table	Create Table
-SUBTIME	CREATE TABLE `SUBTIME` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `SUBTIME` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `SUBTIME` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE SUBTIME;
 drop table if exists $FCT;
@@ -7536,26 +4192,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES SYSTEM_USER (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE SYSTEM_USER;
-Table	Create Table
-SYSTEM_USER	CREATE TABLE `SYSTEM_USER` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `SYSTEM_USER` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `SYSTEM_USER` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE SYSTEM_USER;
 drop table if exists $FCT;
@@ -7578,26 +4215,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES TAN (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE TAN;
-Table	Create Table
-TAN	CREATE TABLE `TAN` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `TAN` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `TAN` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE TAN;
 drop table if exists $FCT;
@@ -7620,26 +4238,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES TIMEDIFF (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE TIMEDIFF;
-Table	Create Table
-TIMEDIFF	CREATE TABLE `TIMEDIFF` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `TIMEDIFF` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `TIMEDIFF` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE TIMEDIFF;
 drop table if exists $FCT;
@@ -7662,26 +4261,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES TIME_FORMAT (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE TIME_FORMAT;
-Table	Create Table
-TIME_FORMAT	CREATE TABLE `TIME_FORMAT` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `TIME_FORMAT` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `TIME_FORMAT` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE TIME_FORMAT;
 drop table if exists $FCT;
@@ -7704,26 +4284,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES TIME_TO_SEC (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE TIME_TO_SEC;
-Table	Create Table
-TIME_TO_SEC	CREATE TABLE `TIME_TO_SEC` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `TIME_TO_SEC` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `TIME_TO_SEC` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE TIME_TO_SEC;
 drop table if exists $FCT;
@@ -7746,26 +4307,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES TOUCHES (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE TOUCHES;
-Table	Create Table
-TOUCHES	CREATE TABLE `TOUCHES` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `TOUCHES` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `TOUCHES` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE TOUCHES;
 drop table if exists $FCT;
@@ -7788,26 +4330,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES TO_DAYS (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE TO_DAYS;
-Table	Create Table
-TO_DAYS	CREATE TABLE `TO_DAYS` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `TO_DAYS` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `TO_DAYS` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE TO_DAYS;
 drop table if exists $FCT;
@@ -7830,26 +4353,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES UCASE (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE UCASE;
-Table	Create Table
-UCASE	CREATE TABLE `UCASE` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `UCASE` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `UCASE` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE UCASE;
 drop table if exists $FCT;
@@ -7872,26 +4376,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES UNCOMPRESS (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE UNCOMPRESS;
-Table	Create Table
-UNCOMPRESS	CREATE TABLE `UNCOMPRESS` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `UNCOMPRESS` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `UNCOMPRESS` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE UNCOMPRESS;
 drop table if exists $FCT;
@@ -7914,26 +4399,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES UNCOMPRESSED_LENGTH (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE UNCOMPRESSED_LENGTH;
-Table	Create Table
-UNCOMPRESSED_LENGTH	CREATE TABLE `UNCOMPRESSED_LENGTH` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `UNCOMPRESSED_LENGTH` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `UNCOMPRESSED_LENGTH` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE UNCOMPRESSED_LENGTH;
 drop table if exists $FCT;
@@ -7956,26 +4422,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES UNHEX (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE UNHEX;
-Table	Create Table
-UNHEX	CREATE TABLE `UNHEX` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `UNHEX` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `UNHEX` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE UNHEX;
 drop table if exists $FCT;
@@ -7998,26 +4445,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES UNIX_TIMESTAMP (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE UNIX_TIMESTAMP;
-Table	Create Table
-UNIX_TIMESTAMP	CREATE TABLE `UNIX_TIMESTAMP` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `UNIX_TIMESTAMP` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `UNIX_TIMESTAMP` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE UNIX_TIMESTAMP;
 drop table if exists $FCT;
@@ -8040,26 +4468,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES UPDATEXML (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE UPDATEXML;
-Table	Create Table
-UPDATEXML	CREATE TABLE `UPDATEXML` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `UPDATEXML` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `UPDATEXML` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE UPDATEXML;
 drop table if exists $FCT;
@@ -8082,26 +4491,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES UPPER (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE UPPER;
-Table	Create Table
-UPPER	CREATE TABLE `UPPER` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `UPPER` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `UPPER` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE UPPER;
 drop table if exists $FCT;
@@ -8124,26 +4514,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES UUID (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE UUID;
-Table	Create Table
-UUID	CREATE TABLE `UUID` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `UUID` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `UUID` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE UUID;
 drop table if exists $FCT;
@@ -8166,26 +4537,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES VAR_POP (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE VAR_POP;
-Table	Create Table
-VAR_POP	CREATE TABLE `VAR_POP` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `VAR_POP` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `VAR_POP` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE VAR_POP;
 drop table if exists $FCT;
@@ -8208,26 +4560,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES VERSION (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE VERSION;
-Table	Create Table
-VERSION	CREATE TABLE `VERSION` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `VERSION` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `VERSION` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE VERSION;
 drop table if exists $FCT;
@@ -8250,26 +4583,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES WEEKDAY (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE WEEKDAY;
-Table	Create Table
-WEEKDAY	CREATE TABLE `WEEKDAY` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `WEEKDAY` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `WEEKDAY` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE WEEKDAY;
 drop table if exists $FCT;
@@ -8292,26 +4606,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES WEEKOFYEAR (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE WEEKOFYEAR;
-Table	Create Table
-WEEKOFYEAR	CREATE TABLE `WEEKOFYEAR` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `WEEKOFYEAR` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `WEEKOFYEAR` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE WEEKOFYEAR;
 drop table if exists $FCT;
@@ -8334,26 +4629,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES WITHIN (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE WITHIN;
-Table	Create Table
-WITHIN	CREATE TABLE `WITHIN` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `WITHIN` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `WITHIN` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE WITHIN;
 drop table if exists $FCT;
@@ -8376,26 +4652,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES X (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE X;
-Table	Create Table
-X	CREATE TABLE `X` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `X` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `X` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE X;
 drop table if exists $FCT;
@@ -8418,26 +4675,7 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES Y (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE Y;
-Table	Create Table
-Y	CREATE TABLE `Y` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `Y` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `Y` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE Y;
 drop table if exists $FCT;
@@ -8460,25 +4698,6 @@ CONSTRAINT fk_fct_space FOREIGN KEY (fk_
 REFERENCES YEARWEEK (col1, col2)
 ) ENGINE InnoDb;
 SHOW CREATE TABLE YEARWEEK;
-Table	Create Table
-YEARWEEK	CREATE TABLE `YEARWEEK` (
-  `col1` int(11) NOT NULL,
-  `col2` int(11) NOT NULL,
-  `col3` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`col1`,`col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE bug21114_child;
-Table	Create Table
-bug21114_child	CREATE TABLE `bug21114_child` (
-  `pk` int(11) NOT NULL,
-  `fk_col1` int(11) NOT NULL,
-  `fk_col2` int(11) NOT NULL,
-  `fk_col3` int(11) NOT NULL,
-  `fk_col4` int(11) NOT NULL,
-  KEY `fk_fct` (`fk_col1`,`fk_col2`),
-  KEY `fk_fct_space` (`fk_col3`,`fk_col4`),
-  CONSTRAINT `fk_fct` FOREIGN KEY (`fk_col1`, `fk_col2`) REFERENCES `YEARWEEK` (`col1`, `col2`),
-  CONSTRAINT `fk_fct_space` FOREIGN KEY (`fk_col3`, `fk_col4`) REFERENCES `YEARWEEK` (`col1`, `col2`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE bug21114_child;
 DROP TABLE YEARWEEK;

--- 1.1/mysql-test/t/parser_stress_func_innodb.test	2006-09-27 15:39:24 -07:00
+++ 1.2/mysql-test/t/parser_stress_func_innodb.test	2006-09-27 15:39:24 -07:00
@@ -2,8 +2,20 @@
 
 let $engine_type=InnoDb;
 
+## Testing with the full log for only a few functions,
+## including FORMAT for witch the bug was reported.
+
 let $FCT=ABS;
 -- source include/parser_stress_func.inc
+let $FCT=FIELD;
+-- source include/parser_stress_func.inc
+let $FCT=FORMAT;
+-- source include/parser_stress_func.inc
+
+## Ignoring the log (this generates too much noise)
+
+-- disable_result_log
+
 let $FCT=ACOS;
 -- source include/parser_stress_func.inc
 let $FCT=ADDDATE;
@@ -114,14 +126,10 @@ let $FCT=EXTERIORRING;
 -- source include/parser_stress_func.inc
 let $FCT=EXTRACTVALUE;
 -- source include/parser_stress_func.inc
-let $FCT=FIELD;
--- source include/parser_stress_func.inc
 let $FCT=FIND_IN_SET;
 -- source include/parser_stress_func.inc
 let $FCT=FLOOR;
 -- source include/parser_stress_func.inc
-let $FCT=FORMAT;
--- source include/parser_stress_func.inc
 let $FCT=FOUND_ROWS;
 -- source include/parser_stress_func.inc
 let $FCT=FROM_DAYS;
@@ -407,4 +415,5 @@ let $FCT=Y;
 let $FCT=YEARWEEK;
 -- source include/parser_stress_func.inc
 
+-- enable_result_log
 

--- 1.38/mysql-test/r/func_math.result	2006-09-27 15:39:24 -07:00
+++ 1.39/mysql-test/r/func_math.result	2006-09-27 15:39:24 -07:00
@@ -102,6 +102,18 @@ Note	1003	select pi() AS `pi()`,format(s
 select degrees(pi()),radians(360);
 degrees(pi())	radians(360)
 180	6.2831853071796
+select format(atan(-2, 2), 6);
+format(atan(-2, 2), 6)
+-0.785398
+select format(atan(pi(), 0), 6);
+format(atan(pi(), 0), 6)
+1.570796
+select format(atan2(-2, 2), 6);
+format(atan2(-2, 2), 6)
+-0.785398
+select format(atan2(pi(), 0), 6);
+format(atan2(pi(), 0), 6)
+1.570796
 SELECT ACOS(1.0);
 ACOS(1.0)
 0

--- 1.24/mysql-test/r/func_misc.result	2006-09-27 15:39:24 -07:00
+++ 1.25/mysql-test/r/func_misc.result	2006-09-27 15:39:24 -07:00
@@ -130,3 +130,115 @@ timediff(b, a) >= '00:00:03'
 drop table t2;
 drop table t1;
 set global query_cache_size=default;
+select pi(3.14);
+ERROR 42000: Incorrect parameter count to builtin function 'pi'
+select tan();
+ERROR 42000: Incorrect parameter count to builtin function 'tan'
+select tan(1, 2);
+ERROR 42000: Incorrect parameter count to builtin function 'tan'
+select makedate(1);
+ERROR 42000: Incorrect parameter count to builtin function 'makedate'
+select makedate(1, 2, 3);
+ERROR 42000: Incorrect parameter count to builtin function 'makedate'
+select maketime();
+ERROR 42000: Incorrect parameter count to builtin function 'maketime'
+select maketime(1);
+ERROR 42000: Incorrect parameter count to builtin function 'maketime'
+select maketime(1, 2);
+ERROR 42000: Incorrect parameter count to builtin function 'maketime'
+select maketime(1, 2, 3, 4);
+ERROR 42000: Incorrect parameter count to builtin function 'maketime'
+select atan();
+ERROR 42000: Incorrect parameter count to builtin function 'atan'
+select atan2(1, 2, 3);
+ERROR 42000: Incorrect parameter count to builtin function 'atan2'
+select benchmark(10, 1+1);
+benchmark(10, 1+1)
+0
+select benchmark(5+5, 2);
+ERROR 42000: Incorrect parameters to builtin function 'BENCHMARK'
+select concat();
+ERROR 42000: Incorrect parameter count to builtin function 'concat'
+select concat("foo");
+concat("foo")
+foo
+select concat_ws();
+ERROR 42000: Incorrect parameter count to builtin function 'concat_ws'
+select concat_ws("foo");
+ERROR 42000: Incorrect parameter count to builtin function 'concat_ws'
+set @pwd="my password";
+select encode("secret", @pwd);
+ERROR 42000: Incorrect parameters to builtin function 'ENCODE'
+select decode("encoded-secret", @pwd);
+ERROR 42000: Incorrect parameters to builtin function 'DECODE'
+select encrypt();
+ERROR 42000: Incorrect parameter count to builtin function 'encrypt'
+select encrypt(1, 2, 3);
+ERROR 42000: Incorrect parameter count to builtin function 'encrypt'
+select des_encrypt("p1", "p2", "not expected");
+ERROR 42000: Incorrect parameter count to builtin function 'des_encrypt'
+select des_decrypt("p1", "p2", "not expected");
+ERROR 42000: Incorrect parameter count to builtin function 'des_decrypt'
+select elt();
+ERROR 42000: Incorrect parameter count to builtin function 'elt'
+select elt(1);
+ERROR 42000: Incorrect parameter count to builtin function 'elt'
+select export_set();
+ERROR 42000: Incorrect parameter count to builtin function 'export_set'
+select export_set("p1");
+ERROR 42000: Incorrect parameter count to builtin function 'export_set'
+select export_set("p1", "p2");
+ERROR 42000: Incorrect parameter count to builtin function 'export_set'
+select export_set("p1", "p2", "p3", "p4", "p5", "p6");
+ERROR 42000: Incorrect parameter count to builtin function 'export_set'
+select field();
+ERROR 42000: Incorrect parameter count to builtin function 'field'
+select field("p1");
+ERROR 42000: Incorrect parameter count to builtin function 'field'
+set @dec=2;
+select format(pi(), @dec);
+ERROR 42000: Incorrect parameters to builtin function 'FORMAT'
+select from_unixtime(),
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select from_unixtime(1, 2, 3);
+ERROR 42000: Incorrect parameter count to builtin function 'from_unixtime'
+select unix_timestamp(1, 2);
+ERROR 42000: Incorrect parameter count to builtin function 'unix_timestamp'
+select greatest();
+ERROR 42000: Incorrect parameter count to builtin function 'greatest'
+select greatest(12);
+ERROR 42000: Incorrect parameter count to builtin function 'greatest'
+select last_insert_id(1, 2);
+ERROR 42000: Incorrect parameter count to builtin function 'last_insert_id'
+select least();
+ERROR 42000: Incorrect parameter count to builtin function 'least'
+select least(12);
+ERROR 42000: Incorrect parameter count to builtin function 'least'
+select locate();
+ERROR 42000: Incorrect parameter count to builtin function 'locate'
+select locate(1);
+ERROR 42000: Incorrect parameter count to builtin function 'locate'
+select locate(1, 2, 3, 4);
+ERROR 42000: Incorrect parameter count to builtin function 'locate'
+select log();
+ERROR 42000: Incorrect parameter count to builtin function 'log'
+select log(1, 2, 3);
+ERROR 42000: Incorrect parameter count to builtin function 'log'
+select make_set();
+ERROR 42000: Incorrect parameter count to builtin function 'make_set'
+select make_set(1);
+ERROR 42000: Incorrect parameter count to builtin function 'make_set'
+select master_pos_wait();
+ERROR 42000: Incorrect parameter count to builtin function 'master_pos_wait'
+select master_pos_wait(1);
+ERROR 42000: Incorrect parameter count to builtin function 'master_pos_wait'
+select master_pos_wait(1, 2, 3, 4);
+ERROR 42000: Incorrect parameter count to builtin function 'master_pos_wait'
+select rand(1, 2, 3);
+ERROR 42000: Incorrect parameter count to builtin function 'rand'
+select round(1, 2, 3);
+ERROR 42000: Incorrect parameter count to builtin function 'round'
+select yearweek();
+ERROR 42000: Incorrect parameter count to builtin function 'yearweek'
+select yearweek(1, 2, 3);
+ERROR 42000: Incorrect parameter count to builtin function 'yearweek'

--- 1.53/mysql-test/r/join_outer.result	2006-09-27 15:39:24 -07:00
+++ 1.54/mysql-test/r/join_outer.result	2006-09-27 15:39:24 -07:00
@@ -245,9 +245,6 @@ PRIMARY KEY (id),
 UNIQUE dni_pasaporte (dni_pasaporte,idPla),
 UNIQUE dni_pasaporte_2 (dni_pasaporte,idPla,cod_asig,any,quatrimestre)
 );
-Warnings:
-Warning	1541	The syntax 'ANY as an identifier' is deprecated and will be removed in MySQL 5.2. Please use `ANY` instead
-Warning	1541	The syntax 'ANY as an identifier' is deprecated and will be removed in MySQL 5.2. Please use `ANY` instead
 INSERT INTO t3 VALUES (1,'11111111',1,10362,98,1,'M');
 CREATE TABLE t4 (
 id int(11) NOT NULL auto_increment,

--- 1.27/mysql-test/t/func_math.test	2006-09-27 15:39:24 -07:00
+++ 1.28/mysql-test/t/func_math.test	2006-09-27 15:39:24 -07:00
@@ -34,6 +34,11 @@ select pi(),format(sin(pi()/2),6),format
 explain extended select pi(),format(sin(pi()/2),6),format(cos(pi()/2),6),format(abs(tan(pi())),6),format(cot(1),6),format(asin(1),6),format(acos(0),6),format(atan(1),6);
 select degrees(pi()),radians(360);
 
+select format(atan(-2, 2), 6);
+select format(atan(pi(), 0), 6);
+select format(atan2(-2, 2), 6);
+select format(atan2(pi(), 0), 6);
+
 #
 # Bug #2338 Trignometric arithmatic problems 
 #

--- 1.18/mysql-test/t/func_misc.test	2006-09-27 15:39:24 -07:00
+++ 1.19/mysql-test/t/func_misc.test	2006-09-27 15:39:24 -07:00
@@ -118,3 +118,142 @@ drop table t1;
 set global query_cache_size=default;
 
 # End of 5.0 tests
+
+## Improving test coverage.
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select pi(3.14);
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select tan();
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select tan(1, 2);
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select makedate(1);
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select makedate(1, 2, 3);
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select maketime();
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select maketime(1);
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select maketime(1, 2);
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select maketime(1, 2, 3, 4);
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select atan();
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select atan2(1, 2, 3);
+
+select benchmark(10, 1+1);
+
+-- error ER_WRONG_PARAMETERS_TO_BUILTIN_FCT
+select benchmark(5+5, 2);
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select concat();
+select concat("foo");
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select concat_ws();
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select concat_ws("foo");
+
+set @pwd="my password";
+-- error ER_WRONG_PARAMETERS_TO_BUILTIN_FCT
+select encode("secret", @pwd);
+-- error ER_WRONG_PARAMETERS_TO_BUILTIN_FCT
+select decode("encoded-secret", @pwd);
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select encrypt();
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select encrypt(1, 2, 3);
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select des_encrypt("p1", "p2", "not expected");
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select des_decrypt("p1", "p2", "not expected");
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select elt();
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select elt(1);
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select export_set();
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select export_set("p1");
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select export_set("p1", "p2");
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select export_set("p1", "p2", "p3", "p4", "p5", "p6");
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select field();
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select field("p1");
+
+set @dec=2;
+-- error ER_WRONG_PARAMETERS_TO_BUILTIN_FCT
+select format(pi(), @dec);
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select from_unixtime(),
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select from_unixtime(1, 2, 3);
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select unix_timestamp(1, 2);
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select greatest();
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select greatest(12);
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select last_insert_id(1, 2);
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select least();
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select least(12);
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select locate();
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select locate(1);
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select locate(1, 2, 3, 4);
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select log();
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select log(1, 2, 3);
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select make_set();
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select make_set(1);
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select master_pos_wait();
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select master_pos_wait(1);
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select master_pos_wait(1, 2, 3, 4);
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select rand(1, 2, 3);
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select round(1, 2, 3);
+
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select yearweek();
+-- error ER_WRONG_PARAMCOUNT_TO_BUILTIN_FCT
+select yearweek(1, 2, 3);
+
Thread
bk commit into 5.1 tree (malff:1.2308)marc.alff27 Sep